www-commits
[Top][All Lists]
Advanced

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

www gnu/why-gnu-linux.it.html gnu/po/gnu-linux-...


From: GNUN
Subject: www gnu/why-gnu-linux.it.html gnu/po/gnu-linux-...
Date: Mon, 30 Aug 2021 09:34:58 -0400 (EDT)

CVSROOT:        /web/www
Module name:    www
Changes by:     GNUN <gnun>     21/08/30 09:34:56

Modified files:
        gnu            : why-gnu-linux.it.html 
        gnu/po         : gnu-linux-faq.ar.po gnu-linux-faq.ca-diff.html 
                         gnu-linux-faq.ca.po gnu-linux-faq.de-diff.html 
                         gnu-linux-faq.de.po gnu-linux-faq.es.po 
                         gnu-linux-faq.fr.po gnu-linux-faq.hr-diff.html 
                         gnu-linux-faq.hr.po gnu-linux-faq.it-diff.html 
                         gnu-linux-faq.it.po gnu-linux-faq.ja.po 
                         gnu-linux-faq.ko-diff.html gnu-linux-faq.ko.po 
                         gnu-linux-faq.nl-diff.html gnu-linux-faq.nl.po 
                         gnu-linux-faq.pl-diff.html gnu-linux-faq.pl.po 
                         gnu-linux-faq.pot gnu-linux-faq.pt-br.po 
                         gnu-linux-faq.ru.po gnu-linux-faq.sq.po 
                         gnu-linux-faq.sr.po gnu-linux-faq.tr.po 
                         gnu-linux-faq.uk-diff.html gnu-linux-faq.uk.po 
                         gnu-linux-faq.zh-cn.po 
                         gnu-users-never-heard-of-gnu.ar-diff.html 
                         gnu-users-never-heard-of-gnu.ar.po 
                         gnu-users-never-heard-of-gnu.bg-diff.html 
                         gnu-users-never-heard-of-gnu.bg.po 
                         gnu-users-never-heard-of-gnu.ca.po 
                         gnu-users-never-heard-of-gnu.cs-diff.html 
                         gnu-users-never-heard-of-gnu.cs.po 
                         gnu-users-never-heard-of-gnu.de.po 
                         gnu-users-never-heard-of-gnu.es.po 
                         gnu-users-never-heard-of-gnu.fa-diff.html 
                         gnu-users-never-heard-of-gnu.fa.po 
                         gnu-users-never-heard-of-gnu.fr.po 
                         gnu-users-never-heard-of-gnu.hr-diff.html 
                         gnu-users-never-heard-of-gnu.hr.po 
                         gnu-users-never-heard-of-gnu.it.po 
                         gnu-users-never-heard-of-gnu.ja.po 
                         gnu-users-never-heard-of-gnu.ml-diff.html 
                         gnu-users-never-heard-of-gnu.ml.po 
                         gnu-users-never-heard-of-gnu.nl.po 
                         gnu-users-never-heard-of-gnu.pl.po 
                         gnu-users-never-heard-of-gnu.pot 
                         gnu-users-never-heard-of-gnu.pt-br.po 
                         gnu-users-never-heard-of-gnu.ru.po 
                         gnu-users-never-heard-of-gnu.sq.po 
                         gnu-users-never-heard-of-gnu.sr-diff.html 
                         gnu-users-never-heard-of-gnu.sr.po 
                         gnu-users-never-heard-of-gnu.tr.po 
                         gnu-users-never-heard-of-gnu.uk.po 
                         gnu-users-never-heard-of-gnu.zh-cn.po 
                         linux-and-gnu.ar-diff.html linux-and-gnu.ar.po 
                         linux-and-gnu.bg.po linux-and-gnu.ca-diff.html 
                         linux-and-gnu.ca.po linux-and-gnu.cs.po 
                         linux-and-gnu.de-diff.html linux-and-gnu.de.po 
                         linux-and-gnu.el-diff.html linux-and-gnu.el.po 
                         linux-and-gnu.es.po linux-and-gnu.fa.po 
                         linux-and-gnu.fr.po linux-and-gnu.hr-diff.html 
                         linux-and-gnu.hr.po linux-and-gnu.id.po 
                         linux-and-gnu.it.po linux-and-gnu.ja.po 
                         linux-and-gnu.ko.po linux-and-gnu.lt-diff.html 
                         linux-and-gnu.lt.po linux-and-gnu.ml-diff.html 
                         linux-and-gnu.ml.po linux-and-gnu.nl.po 
                         linux-and-gnu.pl.po linux-and-gnu.pot 
                         linux-and-gnu.pt-br.po linux-and-gnu.ro.po 
                         linux-and-gnu.ru.po linux-and-gnu.sq.po 
                         linux-and-gnu.sr.po linux-and-gnu.ta.po 
                         linux-and-gnu.tr.po linux-and-gnu.uk-diff.html 
                         linux-and-gnu.uk.po linux-and-gnu.zh-cn.po 
                         why-gnu-linux.bg.po why-gnu-linux.ca.po 
                         why-gnu-linux.cs.po why-gnu-linux.de.po 
                         why-gnu-linux.el.po why-gnu-linux.es.po 
                         why-gnu-linux.fa.po why-gnu-linux.fr.po 
                         why-gnu-linux.hr.po why-gnu-linux.it-diff.html 
                         why-gnu-linux.it.po why-gnu-linux.ja.po 
                         why-gnu-linux.ko.po why-gnu-linux.nl.po 
                         why-gnu-linux.pl.po why-gnu-linux.pot 
                         why-gnu-linux.pt-br.po why-gnu-linux.ro.po 
                         why-gnu-linux.ru.po why-gnu-linux.sq.po 
                         why-gnu-linux.sr.po why-gnu-linux.tr.po 
                         why-gnu-linux.uk.po why-gnu-linux.zh-cn.po 
        server/gnun/compendia: compendium.af.po compendium.ar.po 
                               compendium.bg.po compendium.ca.po 
                               compendium.cs.po compendium.da.po 
                               compendium.de.po compendium.el.po 
                               compendium.eo.po compendium.es.po 
                               compendium.fa.po compendium.fi.po 
                               compendium.fr.po compendium.he.po 
                               compendium.hr.po compendium.id.po 
                               compendium.it.po compendium.ja.po 
                               compendium.ko.po compendium.lt.po 
                               compendium.ml.po compendium.ms.po 
                               compendium.nb.po compendium.nl.po 
                               compendium.pl.po compendium.pot 
                               compendium.pt-br.po compendium.ro.po 
                               compendium.ru.po compendium.sk.po 
                               compendium.sq.po compendium.sr.po 
                               compendium.sv.po compendium.ta.po 
                               compendium.te.po compendium.tr.po 
                               compendium.uk.po compendium.zh-cn.po 
                               compendium.zh-tw.po 

Log message:
        Automatic update by GNUnited Nations.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/why-gnu-linux.it.html?cvsroot=www&r1=1.43&r2=1.44
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ar.po?cvsroot=www&r1=1.72&r2=1.73
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ca-diff.html?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ca.po?cvsroot=www&r1=1.96&r2=1.97
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.de-diff.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.de.po?cvsroot=www&r1=1.124&r2=1.125
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.es.po?cvsroot=www&r1=1.140&r2=1.141
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.fr.po?cvsroot=www&r1=1.124&r2=1.125
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.hr-diff.html?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.hr.po?cvsroot=www&r1=1.43&r2=1.44
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.it-diff.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.it.po?cvsroot=www&r1=1.54&r2=1.55
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ja.po?cvsroot=www&r1=1.95&r2=1.96
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ko-diff.html?cvsroot=www&r1=1.21&r2=1.22
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ko.po?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.nl-diff.html?cvsroot=www&r1=1.47&r2=1.48
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.nl.po?cvsroot=www&r1=1.65&r2=1.66
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.pl-diff.html?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.pl.po?cvsroot=www&r1=1.86&r2=1.87
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.pot?cvsroot=www&r1=1.56&r2=1.57
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.pt-br.po?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.ru.po?cvsroot=www&r1=1.122&r2=1.123
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.sq.po?cvsroot=www&r1=1.117&r2=1.118
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.sr.po?cvsroot=www&r1=1.66&r2=1.67
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.tr.po?cvsroot=www&r1=1.87&r2=1.88
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.uk-diff.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.uk.po?cvsroot=www&r1=1.47&r2=1.48
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-linux-faq.zh-cn.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.ar-diff.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.ar.po?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.bg-diff.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.bg.po?cvsroot=www&r1=1.25&r2=1.26
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.ca.po?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.cs-diff.html?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.cs.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.de.po?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.es.po?cvsroot=www&r1=1.46&r2=1.47
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.fa-diff.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.fa.po?cvsroot=www&r1=1.24&r2=1.25
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.fr.po?cvsroot=www&r1=1.46&r2=1.47
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.hr-diff.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.hr.po?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.it.po?cvsroot=www&r1=1.23&r2=1.24
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.ja.po?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.ml-diff.html?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.ml.po?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.nl.po?cvsroot=www&r1=1.22&r2=1.23
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.pl.po?cvsroot=www&r1=1.29&r2=1.30
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.pot?cvsroot=www&r1=1.19&r2=1.20
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.pt-br.po?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.ru.po?cvsroot=www&r1=1.36&r2=1.37
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.sq.po?cvsroot=www&r1=1.50&r2=1.51
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.sr-diff.html?cvsroot=www&r1=1.10&r2=1.11
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.sr.po?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.tr.po?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.uk.po?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/gnu-users-never-heard-of-gnu.zh-cn.po?cvsroot=www&r1=1.7&r2=1.8
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ar-diff.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ar.po?cvsroot=www&r1=1.63&r2=1.64
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.bg.po?cvsroot=www&r1=1.47&r2=1.48
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ca-diff.html?cvsroot=www&r1=1.14&r2=1.15
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ca.po?cvsroot=www&r1=1.67&r2=1.68
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.cs.po?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.de-diff.html?cvsroot=www&r1=1.6&r2=1.7
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.de.po?cvsroot=www&r1=1.48&r2=1.49
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.el-diff.html?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.el.po?cvsroot=www&r1=1.18&r2=1.19
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.es.po?cvsroot=www&r1=1.77&r2=1.78
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.fa.po?cvsroot=www&r1=1.44&r2=1.45
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.fr.po?cvsroot=www&r1=1.90&r2=1.91
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.hr-diff.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.hr.po?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.id.po?cvsroot=www&r1=1.35&r2=1.36
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.it.po?cvsroot=www&r1=1.75&r2=1.76
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ja.po?cvsroot=www&r1=1.60&r2=1.61
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ko.po?cvsroot=www&r1=1.5&r2=1.6
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.lt-diff.html?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.lt.po?cvsroot=www&r1=1.12&r2=1.13
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ml-diff.html?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ml.po?cvsroot=www&r1=1.51&r2=1.52
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.nl.po?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.pl.po?cvsroot=www&r1=1.54&r2=1.55
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.pot?cvsroot=www&r1=1.38&r2=1.39
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.pt-br.po?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ro.po?cvsroot=www&r1=1.15&r2=1.16
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ru.po?cvsroot=www&r1=1.71&r2=1.72
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.sq.po?cvsroot=www&r1=1.82&r2=1.83
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.sr.po?cvsroot=www&r1=1.52&r2=1.53
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.ta.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.tr.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.uk-diff.html?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.uk.po?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/linux-and-gnu.zh-cn.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.bg.po?cvsroot=www&r1=1.33&r2=1.34
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.ca.po?cvsroot=www&r1=1.52&r2=1.53
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.cs.po?cvsroot=www&r1=1.20&r2=1.21
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.de.po?cvsroot=www&r1=1.53&r2=1.54
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.el.po?cvsroot=www&r1=1.43&r2=1.44
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.es.po?cvsroot=www&r1=1.47&r2=1.48
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.fa.po?cvsroot=www&r1=1.31&r2=1.32
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.fr.po?cvsroot=www&r1=1.59&r2=1.60
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.hr.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.it-diff.html?cvsroot=www&r1=1.1&r2=1.2
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.it.po?cvsroot=www&r1=1.60&r2=1.61
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.ja.po?cvsroot=www&r1=1.42&r2=1.43
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.ko.po?cvsroot=www&r1=1.30&r2=1.31
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.nl.po?cvsroot=www&r1=1.27&r2=1.28
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.pl.po?cvsroot=www&r1=1.41&r2=1.42
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.pot?cvsroot=www&r1=1.28&r2=1.29
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.pt-br.po?cvsroot=www&r1=1.37&r2=1.38
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.ro.po?cvsroot=www&r1=1.9&r2=1.10
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.ru.po?cvsroot=www&r1=1.44&r2=1.45
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.sq.po?cvsroot=www&r1=1.59&r2=1.60
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.sr.po?cvsroot=www&r1=1.32&r2=1.33
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.tr.po?cvsroot=www&r1=1.43&r2=1.44
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.uk.po?cvsroot=www&r1=1.16&r2=1.17
http://web.cvs.savannah.gnu.org/viewcvs/www/gnu/po/why-gnu-linux.zh-cn.po?cvsroot=www&r1=1.8&r2=1.9
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.af.po?cvsroot=www&r1=1.127&r2=1.128
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ar.po?cvsroot=www&r1=1.132&r2=1.133
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.bg.po?cvsroot=www&r1=1.133&r2=1.134
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ca.po?cvsroot=www&r1=1.135&r2=1.136
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.cs.po?cvsroot=www&r1=1.131&r2=1.132
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.da.po?cvsroot=www&r1=1.72&r2=1.73
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.de.po?cvsroot=www&r1=1.181&r2=1.182
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.el.po?cvsroot=www&r1=1.137&r2=1.138
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.eo.po?cvsroot=www&r1=1.17&r2=1.18
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.es.po?cvsroot=www&r1=1.140&r2=1.141
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.fa.po?cvsroot=www&r1=1.129&r2=1.130
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.fi.po?cvsroot=www&r1=1.36&r2=1.37
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.fr.po?cvsroot=www&r1=1.138&r2=1.139
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.he.po?cvsroot=www&r1=1.127&r2=1.128
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.hr.po?cvsroot=www&r1=1.111&r2=1.112
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.id.po?cvsroot=www&r1=1.128&r2=1.129
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.it.po?cvsroot=www&r1=1.157&r2=1.158
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ja.po?cvsroot=www&r1=1.148&r2=1.149
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ko.po?cvsroot=www&r1=1.135&r2=1.136
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.lt.po?cvsroot=www&r1=1.76&r2=1.77
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ml.po?cvsroot=www&r1=1.129&r2=1.130
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ms.po?cvsroot=www&r1=1.35&r2=1.36
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.nb.po?cvsroot=www&r1=1.129&r2=1.130
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.nl.po?cvsroot=www&r1=1.124&r2=1.125
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.pl.po?cvsroot=www&r1=1.146&r2=1.147
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.pot?cvsroot=www&r1=1.133&r2=1.134
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.pt-br.po?cvsroot=www&r1=1.137&r2=1.138
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ro.po?cvsroot=www&r1=1.132&r2=1.133
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ru.po?cvsroot=www&r1=1.133&r2=1.134
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.sk.po?cvsroot=www&r1=1.127&r2=1.128
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.sq.po?cvsroot=www&r1=1.146&r2=1.147
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.sr.po?cvsroot=www&r1=1.128&r2=1.129
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.sv.po?cvsroot=www&r1=1.130&r2=1.131
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.ta.po?cvsroot=www&r1=1.132&r2=1.133
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.te.po?cvsroot=www&r1=1.42&r2=1.43
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.tr.po?cvsroot=www&r1=1.136&r2=1.137
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.uk.po?cvsroot=www&r1=1.135&r2=1.136
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.zh-cn.po?cvsroot=www&r1=1.134&r2=1.135
http://web.cvs.savannah.gnu.org/viewcvs/www/server/gnun/compendia/compendium.zh-tw.po?cvsroot=www&r1=1.128&r2=1.129

Patches:
Index: gnu/why-gnu-linux.it.html
===================================================================
RCS file: /web/www/www/gnu/why-gnu-linux.it.html,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- gnu/why-gnu-linux.it.html   6 Jun 2021 17:59:19 -0000       1.43
+++ gnu/why-gnu-linux.it.html   30 Aug 2021 13:34:52 -0000      1.44
@@ -3,7 +3,7 @@
  https://www.gnu.org/gnu/po/why-gnu-linux.it.po</a>'
  --><!--#set var="ORIGINAL_FILE" value="/gnu/why-gnu-linux.html"
  --><!--#set var="DIFF_FILE" value="/gnu/po/why-gnu-linux.it-diff.html"
- --><!--#set var="OUTDATED_SINCE" value="2021-04-07" --><!--#set 
var="ENGLISH_PAGE" value="/gnu/why-gnu-linux.en.html" -->
+ --><!--#set var="OUTDATED_SINCE" value="2021-04-07" -->
 
 <!--#include virtual="/server/header.it.html" -->
 <!-- Parent-Version: 1.79 -->
@@ -282,7 +282,7 @@
 <p class="unprintable"><!-- timestamp start -->
 Ultimo aggiornamento:
 
-$Date: 2021/06/06 17:59:19 $
+$Date: 2021/08/30 13:34:52 $
 
 <!-- timestamp end -->
 </p>

Index: gnu/po/gnu-linux-faq.ar.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ar.po,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- gnu/po/gnu-linux-faq.ar.po  30 May 2021 17:01:39 -0000      1.72
+++ gnu/po/gnu-linux-faq.ar.po  30 Aug 2021 13:34:52 -0000      1.73
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2010-03-30 16:12+0300\n"
 "Last-Translator: Hossam Hossny <hossam@gnu.org>\n"
 "Language-Team: Arabic <>\n"
@@ -27,28 +27,15 @@
 msgid "GNU/Linux FAQ - GNU Project - Free Software Foundation"
 msgstr "أسئلة غنو/لينكس الشائعة - مشروع غنو - م
ؤسسة البرمجيات الحرة"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU/Linux FAQ"
 msgstr "أسئلة غنو/لينكس الشائعة"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by Richard Stallman"
 msgstr "بقلم ريتشارد ستولمن"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
-"linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a href=\"/"
-"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"لتعلم المزيد عن هذه القضية، بإمكانك قراة 
صفحتنا المتعلقة ب<a href=\"/gnu/"
-"linux-and-gnu.html\">لينكس ومشروع غنو</a> وصفحة <a 
href=\"/gnu/why-gnu-linux."
-"html\">لماذا غنو/لينكس؟</a> وصفحة <a 
href=\"/gnu/gnu-users-never-heard-of-"
-"gnu.html\">مستخدمو غنو الذين لم يسمعوا عنه 
أبدًا</a>."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When people see that we use and recommend the name GNU/Linux for a system "
 "that many others call just &ldquo;Linux&rdquo;, they ask many questions.  "
@@ -58,6 +45,13 @@
 "التشغيل الذي يسميه الآخرون &rdquo;لينكس&ldquo;. 
أدناه بعض الأسئلة الشائعة "
 "وإجابتنا عليها."
 
+#. type: Content of: <div><div><h3>
+# | [-Education-]{+Table of+} Contents
+#, fuzzy
+#| msgid "Education Contents"
+msgid "Table of Contents"
+msgstr "المحنوى التعليمي"
+
 #. type: Content of: <div><div><ul><li>
 # | <a href=\"#why\">Why do you call [-it-] {+the system we use+} GNU/Linux
 # | and not Linux?</a>
@@ -682,7 +676,33 @@
 "يفكروا بما هو صحيح أو خاطئ. ألم يكن بإم
كاننا أن نستفيد منهم لو سلكوا طريقًا "
 "آخرًا؟</a>"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
+# | {+System</a>,+} our page on <a href=\"/gnu/why-gnu-linux.html\">Why
+# | GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our page on <a href=\"/"
+#| "gnu/linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a "
+#| "href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
+"linux-and-gnu.html\">Linux and the GNU System</a>, our page on <a href=\"/"
+"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"لتعلم المزيد عن هذه القضية، بإمكانك قراة 
صفحتنا المتعلقة ب<a href=\"/gnu/"
+"linux-and-gnu.html\">لينكس ومشروع غنو</a> وصفحة <a 
href=\"/gnu/why-gnu-linux."
+"html\">لماذا غنو/لينكس؟</a> وصفحة <a 
href=\"/gnu/gnu-users-never-heard-of-"
+"gnu.html\">مستخدمو غنو الذين لم يسمعوا عنه 
أبدًا</a>."
+
+#. type: Content of: <div><dl><dt>
 # | Why do you call [-it-] {+the system we use+} GNU/Linux and not Linux?
 # | <span class=\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>
 #, fuzzy
@@ -696,7 +716,7 @@
 "لماذا تسمونه غنو/لينكس بدلا من لينكس؟ <span 
class=\"anchor-reference-id\">"
 "(<a href=\"#why\">#why</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Most operating system distributions based on Linux as kernel are basically "
 "modified versions of the GNU operating system.  We began developing GNU in "
@@ -713,11 +733,11 @@
 "االأساسية، وكما أكبر المساهمين إلى النظام 
المتكامل. لقد كانت النظرة الأساسية "
 "نظرتنا أيضًا."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "In fairness, we ought to get at least equal mention."
 msgstr "إننا نستحق على الأقل أن نساوى في الذكر 
من منطلق العدل."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and the GNU System</a> and <a "
 "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
@@ -729,7 +749,7 @@
 "أبدًا</a> لمزيد من التوضيح، و<a 
href=\"/gnu/the-gnu-project.html\">مشروع غنو</"
 "a> لمزيد من المعلومات عن التاريخ."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why is the name important? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
@@ -737,7 +757,7 @@
 "ما سبب أهمية الاسم؟ <span class=\"anchor-reference-id\">(<a 
href=\"#whycare"
 "\">#whycare</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Although the developers of Linux, the kernel, are contributing to the free "
 "software community, many of them do not care about freedom.  People who "
@@ -750,7 +770,7 @@
 "بنسب دور لم يلعبه هؤلاء المطورين في تاريخ م
جتمعنا. إن هذا يجعلهم يزيدون من "
 "قيمة آراء هؤلاء المطورين."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Calling the system GNU/Linux recognizes the role that our idealism played in "
 "building our community, and <a href=\"/gnu/why-gnu-linux.html\">helps the "
@@ -760,7 +780,7 @@
 "<a href=\"/gnu/why-gnu-linux.html\">تساهم في زيادة الوعي 
بأهمية هذه المبادئ</"
 "a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Why do you call it GNU/Linux-]{+What is the real relationship between
 # | GNU+} and [-not-] Linux? <span class=\"anchor-reference-id\">(<a
 # | [-href=\"#why\">#why</a>)</span>-] {+href=\"#what\">#what</a>)</span>+}
@@ -775,14 +795,14 @@
 "لماذا تسمونه غنو/لينكس بدلا من لينكس؟ <span 
class=\"anchor-reference-id\">"
 "(<a href=\"#why\">#why</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU operating system and the Linux kernel are separate software projects "
 "that do complementary jobs.  Typically they are packaged in a <a href=\"/"
 "distros/distros.html\">GNU/Linux distribution</a>, and used together."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How did it come about that most people call the system &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
@@ -791,7 +811,7 @@
 "لماذا يسمي معظم الناس النظام 
&rdquo;لينكس&ldquo;؟ <span class=\"anchor-"
 "reference-id\">(<a href=\"#howerror\">#howerror</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; is a confusion that has spread faster "
 "than the corrective information."
@@ -799,7 +819,7 @@
 "إن تسمية النظام &rdquo;لينكس&ldquo; لغط انتشر 
بسرعة كبيرة فاقت سرعة انتشار "
 "المعلومات الصحيحة."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who combined Linux with the GNU system were not aware that that's "
 "what their activity amounted to.  They focused their attention on the piece "
@@ -815,7 +835,7 @@
 "نتنبه إلى هذه المشكلة ونطلب من الناس تصحيح 
هذه الممارسة؛ وبحلول ذلك الوقت، "
 "كان اللغط قد شاع."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the people who call the system &ldquo;Linux&rdquo; have never heard "
 "why that's not the right thing.  They saw others using that name and assume "
@@ -832,7 +852,7 @@
 "ليوناس تورفالدز عام 1991. هذه الصورة تعزز 
الرأي القائل بأن اسم النظام &rdquo;"
 "لينكس&ldquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Many of the questions in this file represent people's attempts to justify "
 "the name they are accustomed to using."
@@ -840,7 +860,7 @@
 "معظم الأسئلة الموجودة في هذا  الملف تعبر 
عن محاولة البعض تبرير تسمية النظام "
 "بالاسم الذي اعتادوا استخدامه."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we always say &ldquo;GNU/Linux&rdquo; instead of &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
@@ -848,7 +868,7 @@
 "هل ينبغي علينا أن نسميه &rdquo;غنو/ليكس&ldquo; 
بدلا من &rdquo;لينكس&ldquo;؟ "
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not always&mdash;only when you're talking about the whole system.  When "
 "you're referring specifically to the kernel, you should call it &ldquo;"
@@ -857,7 +877,7 @@
 "ليس دائمًا&mdash;فقط عندما تتحدث عن النظام 
كله. عندما ترغب في الإشارة إلى "
 "النواة، ينبغي عليك استخدام الاسم 
&rdquo;لينكس&ldquo; الذي اختاره مطوروها."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
 "call the whole system by the same name as the kernel.  This causes many "
@@ -871,7 +891,7 @@
 "الحديث عن النواة والنظام كله. سوف تتجاوز 
اللغط بتسمية النظام كله &rdquo;غنو/"
 "لينكس&ldquo;، وتسمية النواة &rdquo;لينكس&ldquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Would Linux have achieved the same success if there had been no GNU? <span "
 "class=\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</"
@@ -880,7 +900,7 @@
 "هل سيحقق لينكس النجاح ذاته بدون غنو؟ <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#linuxalone\">#linuxalone</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In that alternative world, there would be nothing today like the GNU/Linux "
 "system, and probably no free operating system at all.  No one attempted to "
@@ -893,7 +913,7 @@
 "غنو و(لاحقًا) مجموعة دراسة أنظمة الحاسوب 
في بركلي، والتي طلب منها مشروع غنو "
 "تحرير كودها."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds was partly influenced by a speech about GNU in Finland in "
 "1990.  It's possible that even without this influence he might have written "
@@ -906,7 +926,7 @@
 "الأرجح ستكون غير حرة. صارت لينكس حرة في عام 
1992 عندما أطلقها ليوناس تحت "
 "رخصة غنو جي بي إل. (راجع ملاحظات إصدار 
النسخة 0.12.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Even if Torvalds had released Linux under some other free software license, "
 "a free kernel alone would not have made much difference to the world.  The "
@@ -917,7 +937,7 @@
 "تغير العالم. قوة لينكس جائت من وضعها في 
إطار أكبر، وهو نظام تشغيل حر كامل: "
 "غنو/لينكس."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better for the community if you did not divide people with "
 "this request? <span class=\"anchor-reference-id\">(<a href=\"#divide"
@@ -926,7 +946,7 @@
 "ليس من الأفضل ألا تشقوا صف المجتمع بهذا 
الطلب؟ <span class=\"anchor-"
 "reference-id\">(<a href=\"#divide\">#divide</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
 "people.  We are asking them to give the GNU Project credit for the GNU "
@@ -935,7 +955,7 @@
 "عندما نطلق من الناس قول &rdquo;غنو/لينكس&ldquo;، 
فإننا لا نقسهم. إننا نطالب "
 "أن ينسب نظام غنو إلى مشروع غنو. إن هذا لا يم
ثل انتقادًا لأحد ولا إقصاءً."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, there are people who do not like our saying this.  Sometimes those "
 "people push us away in response.  On occasion they are so rude that one "
@@ -947,7 +967,7 @@
 "الحالات  لدرجة أننا كنا نتسائل فيما إذا 
كانوا يحاولون إسكاتنا. لن يسكتونا، "
 "لكنهم يشقون صف المجتمع، ولذا فإننا نأمل م
نك أن تقنعهم بضرورة التوقف."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, this is only a secondary cause of division in our community.  The "
 "largest division in the community is between people who appreciate free "
@@ -962,7 +982,7 @@
 "يتعلقون بالمزايا العملية البحتة ويعرضون 
البرمجيات الحرة كوسيلة تطوير فعالة "
 "فحسب (حركة المصادر المفتوحة)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This disagreement is not just a matter of names&mdash;it is a matter of "
 "differing basic values.  It is essential for the community to see and think "
@@ -977,7 +997,7 @@
 "\"/philosophy/open-source-misses-the-point.html\">لماذا لا تفي 
المصادر "
 "المفتوحة بغرض البرمجيات الحرة</a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The disagreement over values partially aligns with the amount of attention "
 "people pay to the GNU Project's role in our community.  People who value "
@@ -998,7 +1018,7 @@
 "لأن القضية حساسة. يمكن للخلاف أن ينتهي إذا 
أقنعنا الجميع (وهو الأمر الذين لن "
 "يكون سهلا) أو هزمنا تمامًا (لنأمل ألا يحدث 
ذلك)."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Doesn't the GNU project support an individual's free speech rights to call "
 "the system by any name that individual chooses? <span class=\"anchor-"
@@ -1008,7 +1028,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#freespeech\">#freespeech</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Yes, indeed, we believe you have a free speech right to call the operating "
 "system by any name you wish.  We ask that people call it GNU/Linux as a "
@@ -1020,7 +1040,7 @@
 "تسمية النظام غنو/لينكس للإنصاف لمشروع غنو 
ولنشر قيم الحرية التي يناضل مشروع "
 "غنو من أجلها ولنعلم الناس أن الحرية هي 
التي أوجدت النظام."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | Since everyone knows [-GNU's-] {+the+} role {+of GNU+} in developing the
 # | system, doesn't the &ldquo;GNU/&rdquo; in the name go without saying?
 # | <span class=\"anchor-reference-id\">(<a
@@ -1039,7 +1059,7 @@
 "بديهية ولا تحتاج الذكر؟ <span 
class=\"anchor-reference-id\">(<a href="
 "\"#everyoneknows\">#everyoneknows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Experience shows that the system's users, and the computer-using public in "
 "general, often know nothing about the GNU system.  Most articles about the "
@@ -1053,7 +1073,7 @@
 "gnu-users-never-heard-of-gnu.html\">مستخدمو غنو الذين لم 
يسمعوا عنه أبدًا</a> "
 "تشرح المزيد عن هذا."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who say this are probably geeks thinking of the geeks they know.  "
 "Geeks often do know about GNU, but many have a completely wrong idea of what "
@@ -1064,7 +1084,7 @@
 "منهم لديه تصور خاطئ تمامًا عن ما هو غنو. 
على سبيل المثال، كثير يعتقدون أنه "
 "مجموعة &rdquo;<a href=\"#tools\">أدوات</a>&ldquo;، أو م
شروع لتطوير أدوات."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The wording of this question, which is typical, illustrates another common "
 "misconception.  To speak of &ldquo;GNU's role&rdquo; in developing something "
@@ -1076,7 +1096,7 @@
 "شيء فإن هذا يعني أن غنو مجموعة من الأشخاص. 
إن غنو نظام تشغيل. قد يفيدنا "
 "الحديث عن دور مشروع غنو في نشاطات أخرى، 
لكن ليس من بينها غنو."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since I know the role of GNU in this system, why does it matter what name I "
 "use? <span class=\"anchor-reference-id\">(<a href="
@@ -1085,7 +1105,7 @@
 "أنا أعرف دور غنو، ما فائدة الاسم الذي 
أستخدمه؟ <span class=\"anchor-"
 "reference-id\">(<a href=\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your words don't reflect your knowledge, you don't teach others.  Most "
 "people who have heard of the GNU/Linux system think it is &ldquo;"
@@ -1096,7 +1116,7 @@
 "لينكس يعتقدون أنه &rdquo;لينكس&ldquo; (الذي بدأه 
ليوناس تورفلدز) وأنه بدأه "
 "ليكون  &rdquo;مفتوح المصدر&ldquo;. إذا لم تخبرهم 
أنت، فمن سيخبرهم؟"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't shortening &ldquo;GNU/Linux&rdquo; to &ldquo;Linux&rdquo; just like "
 "shortening &ldquo;Microsoft Windows&rdquo; to &ldquo;Windows&rdquo;? <span "
@@ -1106,13 +1126,13 @@
 "&rdquo;مايكروسوفت ويندوز&ldquo; إلى 
&rdquo;ويندوز&ldquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#windows\">#windows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It's useful to shorten a frequently-used name, but not if the abbreviation "
 "is misleading."
 msgstr "من المفيد اختصار اسم مستخدم بكثرة، لكن 
يجب ألا يكون الاختصار مضللا."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Almost everyone in developed countries really does know that the &ldquo;"
 "Windows&rdquo; system is made by Microsoft, so shortening &ldquo;Microsoft "
@@ -1125,7 +1145,7 @@
 "ويندوز&ldquo; لن يضلل أحدًا في طبيعة وأصل 
النظام. اختصار &rdquo;غنو/"
 "لينكس&ldquo; إلى &rdquo;لينكس&ldquo; يعطي تصورًا 
خاطئًا عن أصل النظام."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The question is itself misleading because GNU and Microsoft are not the same "
 "kind of thing.  Microsoft is a company; GNU is an operating system."
@@ -1133,7 +1153,7 @@
 "السؤال نفسه خطأ لأن غنو ومايكروسوفت ليسا 
الشيء ذاته. مايكروسوفت شركة؛ أما "
 "غنو فنظام تشغيل."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't GNU a collection of programming tools that were included in Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
@@ -1141,7 +1161,7 @@
 "أليس غنو مجموعة من الأدوات البرمجية التي 
ضُمّنت في لينكس؟ <span class=\"anchor-"
 "reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "People who think that Linux is an entire operating system, if they hear "
 "about GNU at all, often get a wrong idea of what GNU is.  They may think "
@@ -1157,7 +1177,7 @@
 "&rdquo;غنو&ldquo; اسم لنظام التشغيل  صعبة في 
الإطار الذي يتخيلونه، والذي اسم "
 "نظام التشغيل فيه &rdquo;لينكس&ldquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Project was named after the GNU operating system&mdash;it's the "
 "project to develop the GNU system.  (See <a href=\"/gnu/initial-announcement."
@@ -1166,7 +1186,7 @@
 "سمي مشروع غنو على نظام التشغيل غنو، فهو م
شروع لتطوير نظام غنو.  (راجع <a "
 "href=\"/gnu/initial-announcement.html\">إعلان عام 1983 
الأولي</a>.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We developed programs such as GCC, GNU Emacs, GAS, GLIBC, BASH, etc., "
 "because we needed them for the GNU operating system.  GCC, the GNU Compiler "
@@ -1179,7 +1199,7 @@
 "الذي كتبناه لنظام التشغيل عنو. لقد طورنا 
(نحن العاملون في مشروع غنو) "
 "Ghostscript و GNUCash وشطرنج غنو وغنوم لنظام غنو 
أيضًا."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the difference between an operating system and a kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
@@ -1187,7 +1207,7 @@
 "ما الفرق بين نظام التشغيل والنواة؟ <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#osvskernel\">#osvskernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "An operating system, as we use the term, means a collection of programs that "
 "are sufficient to use the computer to do a wide variety of jobs.  A general "
@@ -1198,7 +1218,7 @@
 "لاستخدام الحاسوب للقيام بمجموعة من المهم
ات. يجب أن يتمكن نظام التشغيل من "
 "القيام بالمهمات التي يريدها كثير من الم
ستخدمون ليكون مكتملا."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The kernel is one of the programs in an operating system&mdash;the program "
 "that allocates the machine's resources to the other programs that are "
@@ -1207,7 +1227,7 @@
 "النواة برنامج واحد في نظام التشغيل وهي 
البرنامج الذي يوزع موارد الجهاز على "
 "بقية البرامج الذي تعمل. تتولَ النواة أيضا 
بدء وتشغيل البرامج الأخرى."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "To confuse matters, some people use the term &ldquo;operating system&rdquo; "
 "to mean &ldquo;kernel&rdquo;.  Both uses of the term go back many years.  "
@@ -1226,7 +1246,7 @@
 "بيركلي من يونكس تضمنت ألعابًا. وبما أننا 
خططنا لأن يكون غنو نظام تشغيل شبيه "
 "بيونكس، فإننا نستخدم المصطلح &rdquo;نظام 
التشغيل&ldquo; في نفس السياق."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the time when people speak of the &ldquo;Linux operating "
 "system&rdquo; they are using &ldquo;operating system&rdquo; in the same "
@@ -1243,7 +1263,7 @@
 "فضلك قل &rdquo;النواة&ldquo; أيضًا لتفادي اللغط 
الذي قد ينتج عن عدم وضوح "
 "الجزء الذي تشير إليه."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
@@ -1254,7 +1274,7 @@
 "من البرامج، بدلا من &rdquo;نظام التشغيل&ldquo;، 
فلا بأس في ذلك. سوف يكون "
 "حديثك عن توزيعات نظام غنو/لينكس."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The kernel of a system is like the foundation of a house.  How can a house "
 "be almost complete when it doesn't have a foundation? <span class=\"anchor-"
@@ -1263,14 +1283,14 @@
 "نواة النظام مثل أساس المنزل. كيف يمكن للم
نزل أن يكون شبه مكتمل بدون الأساس؟ "
 "<span class=\"anchor-reference-id\">(<a href=\"#house\">#house</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "A kernel is not much like the foundation of a house because building an "
 "operating system is not much like building a house."
 msgstr ""
 "إن النواة ليست مثل أساس المنزل لأن بناء 
نظام التشغيل ليس مثل بناء المنزل."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A house is built from lots of little general parts that are cut and put "
 "together in situ.  They have to be put together from the bottom up.  Thus, "
@@ -1281,7 +1301,7 @@
 "الأسفل إلى الأعلى. ولذا فبدون الأساس لا يم
كن أن يوجد البناء، وكل ما سيوجد "
 "حفرة في الأرض."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "By contrast, an operating system consists of complex components that can be "
 "developed in any order.  When you have developed most of the components, "
@@ -1295,7 +1315,7 @@
 "الدولية (بدلا من منزل عادي). لو كانت معظم 
أجزاء المحطة في المدارس تنتظر "
 "مكونًا واحدًا جوهريًا، فإن هذا سيشبه وضع 
غنو عام 1992."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't the kernel the brain of the system? <span class=\"anchor-reference-id"
 "\">(<a href=\"#brain\">#brain</a>)</span>"
@@ -1303,14 +1323,14 @@
 "أليست النواة عقل النظام؟ <span 
class=\"anchor-reference-id\">(<a href="
 "\"#brain\">#brain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A computer system is not much like a human body, and no part of it plays a "
 "role comparable to that of the brain in a human."
 msgstr ""
 "نظام الحاسب لا يشبه الجسم البشري كثيرًا، 
ولا شيء فيه يشبه دور العقل في الجسم."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't writing the kernel most of the work in an operating system? <span "
 "class=\"anchor-reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</"
@@ -1319,11 +1339,11 @@
 "ألا تمثل كتابة النواة معظم عمل نظام 
التشغيل؟ <span class=\"anchor-reference-"
 "id\">(<a href=\"#kernelmost\">#kernelmost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "No, many components take a lot of work."
 msgstr "لا، الكثير من الأجزاء تتطلب الكثير من 
العمل."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Isn't writing-]{+An operating system requires a kernel.  Since+} the
 # | [-kernel most of-] {+GNU Project didn't develop a kernel, how can+} the
 # | [-work in an operating system? <span-] {+system be GNU?<span+}
@@ -1343,7 +1363,7 @@
 "ألا تمثل كتابة النواة معظم عمل نظام 
التشغيل؟ <span class=\"anchor-reference-"
 "id\">(<a href=\"#kernelmost\">#kernelmost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The people who argue that way for calling the system &ldquo;Linux&rdquo; are "
 "using a double standard.  An operating system requires compilers, editors, "
@@ -1352,34 +1372,34 @@
 "any of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "That standard is too strict, not the right way to judge the contributions of "
 "any contributor."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds made an important contribution to the operating system we "
 "use; the GNU Project started earlier and contributed much more.  The name "
 "&ldquo;GNU/Linux&rdquo; gives credit to each."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How can GNU be an operating system, if I can't get something called &ldquo;"
 "GNU&rdquo; and install it? <span class=\"anchor-reference-id\">(<a href="
 "\"#notinstallable\">#notinstallable</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Many <a href=\"/distros/distros.html\"> packaged and installable versions of "
 "GNU</a> are available.  None of them is called simply &ldquo;GNU&rdquo;, but "
 "GNU is what they basically are."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We expected to release the GNU system packaged for installation, but this "
 "plan was overtaken by events: in 1992 others were already packaging GNU "
@@ -1391,14 +1411,14 @@
 "Hurd kernel&mdash;which wasn't ready yet."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Hurd kernel never became sufficiently ready; we only recommend it to "
 "those interested in working on it.  So we never packaged GNU with the GNU "
 "Hurd kernel.  However, Debian packaged this combination as Debian GNU/Hurd."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are now developing an advanced Scheme-based package manager called Guix "
 "and a complete system distribution based on it called the <a href=\"/"
@@ -1406,14 +1426,14 @@
 "repackaging a substantial part of the GNU system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We never took the last step of packaging GNU under the name &ldquo;"
 "GNU&rdquo;, but that doesn't alter what kind of thing GNU is.  GNU is an "
 "operating system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "We're calling the whole system after the kernel, Linux.  Isn't it normal to "
 "name an operating system after a kernel? <span class=\"anchor-reference-id\">"
@@ -1423,7 +1443,7 @@
 "التشغيل على أنويتها؟ <span 
class=\"anchor-reference-id\">(<a href="
 "\"#afterkernel\">#afterkernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "That practice seems to be very rare&mdash;we can't find any examples other "
 "than the misuse of the name &ldquo;Linux&rdquo;.  Normally an operating "
@@ -1437,7 +1457,7 @@
 "المطورون اسمًا للنظام المتكامل. ليس 
للنواة عادة اسم بذاتها، فالناس يقولون "
 "&rdquo;نواة كذا وكذا&ldquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Because those two constructions are used synonymously, the expression &ldquo;"
 "the Linux kernel&rdquo; can easily be misunderstood as meaning &ldquo;the "
@@ -1450,13 +1470,13 @@
 "اللبس بقول (أو كتابة) &rdquo;النواة لينكس&ldquo; 
أو &rdquo;لينكس (النواة)"
 "&ldquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can another system have &ldquo;the feel of Linux&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is no such thing as the &ldquo;feel of Linux&rdquo; because Linux has "
 "no user interfaces.  Like any modern kernel, Linux is a base for running "
@@ -1465,7 +1485,7 @@
 "feel&rdquo; comes from them."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  How about "
 "recommending a shorter name? <span class=\"anchor-reference-id\">(<a href="
@@ -1474,7 +1494,7 @@
 "مشكلة &rdquo;غنو/لينكس&ldquo; أنه طويل جدًا. هل 
تقترحون اسمًا أقصر؟ <span "
 "class=\"anchor-reference-id\">(<a href=\"#long\">#long</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "For a while we tried the name &ldquo;LiGNUx&rdquo;, which combines the words "
 "&ldquo;GNU&rdquo; and &ldquo;Linux&rdquo;.  The reaction was very bad.  "
@@ -1484,7 +1504,7 @@
 "لينكس&ldquo;، لكن استجابة الناس كانت سيئة 
جدة. إن لاسم &rdquo;غنو/"
 "لينكس&ldquo; قبول أكثر."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
 "call it &ldquo;GNU/Linux&rdquo; <a href=\"#justgnu\"> for the reasons given "
@@ -1493,14 +1513,14 @@
 "إن أقصر اسم مشروع للنظام هو  &rdquo;غنو&ldquo; 
لكننا نسميه &rdquo;غنو/"
 "لينكس&ldquo; <a href=\"#justgnu\">للأسباب المُوضحة 
أدناه</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How about calling the system &ldquo;GliNUx&rdquo; (instead of &ldquo;GNU/"
 "Linux&rdquo;)? <span class=\"anchor-reference-id\">(<a href="
 "\"#long1\">#long1</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The name &ldquo;GNU&rdquo; does not visibly appear in &ldquo;Glinux,&rdquo; "
 "so most people would not notice it is there.  Even if it is capitalized as "
@@ -1508,41 +1528,41 @@
 "reference to GNU."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be comparable to writing &ldquo;GNU/Linux,&rdquo; but putting "
 "&ldquo;GNU/&rdquo; in print so small that most people could not read it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  Why should "
 "I go to the trouble of saying &ldquo;GNU/&rdquo;? <span class=\"anchor-"
 "reference-id\">(<a href=\"#long2\">#long2</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
 "the system that we developed, can't you take one second to recognize our "
 "work?"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Unfortunately, &ldquo;GNU/Linux&rdquo; is five syllables. People won't use "
 "such a long term. Shouldn't you find a shorter one? <span class=\"anchor-"
 "reference-id\">(<a href=\"#long3\">#long3</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, &ldquo;GNU/Linux&rdquo; is only four syllables.  &ldquo;"
 "Unfortunately&rdquo; is five syllables, yet people show no sign of "
 "reluctance to use that word."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Should we always-]{+Stallman doesn't ask us to call him &ldquo;Richard
 # | Matthew Stallman&rdquo; every the time.  So why ask us to+} say
 # | &ldquo;GNU/Linux&rdquo; [-instead of &ldquo;Linux&rdquo;?-] {+every
@@ -1562,21 +1582,21 @@
 "هل ينبغي علينا أن نسميه &rdquo;غنو/ليكس&ldquo; 
بدلا من &rdquo;لينكس&ldquo;؟ "
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Omitting &ldquo;Matthew&rdquo; does not misrepresent anything important "
 "about Stallman's nature, origin, ideas or purpose.  Omitting &ldquo;"
 "GNU&rdquo; does misrepresent those things about the GNU/Linux system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is an example of a frequent way of hiding a fallacy: to bury it inside "
 "a misleading analogy.  A better analogy would be, &ldquo;Why shouldn't we "
 "call Stallman &lsquo;Torvalds&rsquo;?&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since Linux is a secondary contribution, would it be false to the facts to "
 "call the system simply &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id"
@@ -1586,7 +1606,7 @@
 "غنو&ldquo; فحسب؟ <span class=\"anchor-reference-id\">(<a 
href=\"#justgnu"
 "\">#justgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would not be false to the facts, but it is not the best thing to do.  "
 "Here are the reasons we call that system version &ldquo;GNU/Linux&rdquo; "
@@ -1595,7 +1615,7 @@
 "كلا، لن يكون مناقضًا للحقائق، لكنه ليس 
التصرف الأمثل. أدناه سبب تسميتنا نسخة "
 "النظام تلك &rdquo;غنو/لينكس&ldquo; بدلا من 
&rdquo;غنو&ldquo;:"
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It's not exactly GNU&mdash;it has a different kernel (that is, Linux).  "
 "Distinguishing GNU/Linux from GNU is useful."
@@ -1603,7 +1623,7 @@
 "النظام ليس غنو نفسه&mdash;إن لديه نواة أخرى 
(هي لينكس). التفريق بين غنو/"
 "لينكس وغنو مفيد."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It would be ungentlemanly to ask people to <em>stop</em> giving any credit "
 "to Linus Torvalds.  He did write an important component of the system.  We "
@@ -1621,7 +1641,7 @@
 "تمامًا مع آرائه الفلسفية، لكننا نعالج مع 
هذا الخلاف باحترام وانفتاح، وليس "
 "بإقصائه من نسب مساهمته إلى النظام إليه."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
 "&ldquo;GNU&rdquo; they may simply not recognize we're talking about the same "
@@ -1632,7 +1652,7 @@
 "غنو&ldquo; فلن يعرفوا أننا نتحدث عن النظام 
ذاته. إذا قلنا &rdquo;غنو/"
 "لينكس&ldquo; فسيربطون بينه وبين ما سمعوا عنه."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "I would have to pay a fee if I use &ldquo;Linux&rdquo; in the name of a "
 "product, and that would also apply if I say &ldquo;GNU/Linux&rdquo;.  Is it "
@@ -1645,7 +1665,7 @@
 "غنو&ldquo; بدون &rdquo;لينكس&ldquo;, لأتفادى الرسوم
؟ <span class=\"anchor-"
 "reference-id\">(<a href=\"#trademarkfee\">#trademarkfee</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There's nothing wrong in calling the system &ldquo;GNU&rdquo;; basically, "
 "that's what it is.  It is nice to give Linus Torvalds a share of the credit "
@@ -1654,7 +1674,7 @@
 "تسمية النظام &rdquo;غنو&ldquo; ليست خطأ؛ فهذا هو 
أساس النظام. من اللطف أن "
 "تنسبه إلى ليوناس تورفلدز أيضا، لكنك لست م
طالبا بالدفع للقيام بذلك."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "So if you want to refer to the system simply as &ldquo;GNU&rdquo;, to avoid "
 "paying the fee for calling it &ldquo;Linux&rdquo;, we won't criticize you."
@@ -1662,7 +1682,7 @@
 "لذا إذا أردت الإشارة إلى النظام الكامل 
ب&rdquo;غنو&ldquo; لتجنب دفع رسوم "
 "تسميته &rdquo;لينكس&ldquo; فإننا لن نتقدك."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today; it includes "
 "TeX, X11, Apache, Perl, and many more programs.  Don't your arguments imply "
@@ -1675,7 +1695,7 @@
 "إليهم أيضًا؟ (لكن هذا سوف يؤدي بنا إلى اسم 
طويل جدًا ولا معقول). <span class="
 "\"anchor-reference-id\">(<a href=\"#many\">#many</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "What we say is that you ought to give the system's principal developer a "
 "share of the credit.  The principal developer is the GNU Project, and the "
@@ -1684,7 +1704,7 @@
 "نحن نقول أن عليك تنسب النظام إلى مطورهم 
الأصلي أيضًا. النطور الأصلي هو مشروع "
 "غنو، والنظام هو أصلا غنو."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you feel even more strongly about giving credit where it is due, you "
 "might feel that some secondary contributors also deserve credit in the "
@@ -1698,7 +1718,7 @@
 "تسميته غنو/إكس11/لينكس، فافعل ذلك من رجاءً. 
إذا شعرت أن بيرل حزينة على عدم "
 "ذكرها، وأردت كتابة الاسم غنو/لينكس/بيرل، 
فلا تتردد في ذلك."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Since a long name such as GNU/X11/Apache/Linux/TeX/Perl/Python/FreeCiv "
 "becomes absurd, at some point you will have to set a threshold and omit the "
@@ -1711,7 +1731,7 @@
 "الأخرى. لا يوجد حد فاصل واضح يمكن التوقف 
عنده، ولذا فإن المجال لك مفتوح، ولن "
 "نجادلك فيه."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Different threshold levels would lead to different choices of name for the "
 "system.  But one name that cannot result from concerns of fairness and "
@@ -1724,7 +1744,7 @@
 "وهو &rdquo;لينكس&ldquo;. ليس من العدل نسب الكل 
إلى مساهمة فرعية (لينكس) "
 "وتجاهل المساهم الرئيسي (غنو)."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Many companies contributed to-]{+systemd plays an important role in+}
 # | the {+GNU/Linux+} system as it is today; [-doesn't that mean-] {+are+} we
 # | [-ought-] {+obligated+} to call it [-GNU/Red&nbsp;Hat/Novell/Linux?-]
@@ -1746,7 +1766,7 @@
 "نسميه غنو/ردهات/نوفل/لينكس؟ <span 
class=\"anchor-reference-id\">(<a href="
 "\"#manycompanies\">#manycompanies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "systemd is a fairly important component, but not as important as the kernel "
 "(Linux), nor as important as the basis of the system as a whole (GNU).  "
@@ -1754,7 +1774,7 @@
 "system &ldquo;GNU/systemd/Linux&rdquo;, there is nothing wrong with doing so."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today, but they don't "
 "insist on calling it XYZ/Linux.  Why should we treat GNU specially? <span "
@@ -1764,7 +1784,7 @@
 "لينكس. لماذا نعامل غنو معاملة خاصة؟ <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#others\">#others</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Thousands of projects have developed programs commonly included in today's "
 "GNU/Linux systems.  They all deserve credit for their contributions, but "
@@ -1775,7 +1795,7 @@
 "تستحق الإشادة، لكنهم ليسوا المطورين 
الرئيسيين للنظام المتكامل، ولذا فإنهم لا "
 "يطلبون الإشارة بالطريقة ذاتها"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is different because it is more than just a contributed program, more "
 "than just a collection of contributed programs.  GNU is the framework on "
@@ -1784,7 +1804,7 @@
 "غنو مختلف لأنه أكثر من مجرد برنامج مساهم 
به، إنه أكثر من مجرد مجموعة من "
 "البرامج المساهم بها. غنو هو إطار العمل 
الذي أسس النظام عليه."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "GNU is a small fraction of the system nowadays, so why should we mention it? "
 "<span class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</"
@@ -1793,7 +1813,7 @@
 " غنو جزء صغير من النظام، لماذا علينا أن 
نذكره؟ <span class=\"anchor-"
 "reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In 2008, we found that GNU packages made up 15% of the &ldquo;main&rdquo; "
 "repository of the gNewSense GNU/Linux distribution.  Linux made up 1.5%.  So "
@@ -1804,7 +1824,7 @@
 "غنو/لينكس. شكل لينكس 1.5% منها. ولذا فإن نفس 
الحجة سوف تنطبق أكثر على من "
 "يسمي النظام &rdquo;لينكس&ldquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is a small fraction of the system nowadays, and Linux is an even smaller "
 "fraction.  But they are the system's core; the system was made by combining "
@@ -1813,7 +1833,7 @@
 "غنو جزء صغير من النظام اليوم، ولينكس جزء 
أصغر منه. لكنهما أساس النظام. لقد "
 "بُني النظام بالجمع بينهما. ولذا فإن اسم 
&rdquo;غنو/لينكس&ldquo; هو المناسب."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many companies contributed to the system as it is today; doesn't that mean "
 "we ought to call it GNU/Red&nbsp;Hat/Novell/Linux? <span class=\"anchor-"
@@ -1823,7 +1843,7 @@
 "نسميه غنو/ردهات/نوفل/لينكس؟ <span 
class=\"anchor-reference-id\">(<a href="
 "\"#manycompanies\">#manycompanies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is not comparable to Red Hat or Novell; it is not a company, or an "
 "organization, or even an activity.  GNU is an operating system.  (When we "
@@ -1835,7 +1855,7 @@
 "نظام تشغيل. (عندما نتحدث عن مشروع غنو فإننا 
نشير إلى المشروع المختص بتطوير "
 "نظام غنو). نظام غنو/لينكس مبني على غنو، 
ولذا فإن غنو يجب أن يظهر في الاسم."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Much of those companies' contribution to the GNU/Linux system lies in the "
 "code they have contributed to various GNU packages including GCC and GNOME.  "
@@ -1846,7 +1866,7 @@
 "بما فيها GCC وغنوم؛ الأمر الذي يعني وجود 
الإشارة إلى الشركات ومعها كل مطوري "
 "غنو الآخرين."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
@@ -1855,7 +1875,7 @@
 "لماذا تكتبون &rdquo;غنو/لينكس&ldquo; بدلا من 
&rdquo;غنو لينكسx&ldquo;؟ <span "
 "class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean "
@@ -1867,7 +1887,7 @@
 "غنو من لينكس&ldquo; أو &rdquo;حزمة لينكس التابعة 
لغنو&ldquo;، وكلا المعنيين "
 "خاطئ."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is not a GNU package; that is, it wasn't developed under the GNU "
 "Project's aegis or contributed specifically to the GNU Project.  Linus "
@@ -1878,14 +1898,32 @@
 "المساهمة بها خصيصًا لمشروع غنو. ليوناس 
تورلفلدز كتب لينكس مستقلا، كمشروع خاص "
 "به ولذا فإن &rdquo;حزمة لينكس التابعة 
لغنو&ldquo; ليست صائبة."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | We're not talking about a distinct GNU version of Linux, the kernel.  The
+# | free GNU/Linux distros do have a <a
+# | [-href=\"http://directory.fsf.org/project/linux\";>separate-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>separate+} version
+# | of Linux</a>, since the &ldquo;standard&rdquo; version contains
+# | non[---]free firmware &ldquo;blobs&rdquo;.  If this were part of the GNU
+# | Project, it could be considered &ldquo;GNU Linux&rdquo;; but we would not
+# | want to call it that, because it would be too confusing.
+#, fuzzy
+#| msgid ""
+#| "We're not talking about a distinct GNU version of Linux, the kernel.  The "
+#| "free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/";
+#| "project/linux\">separate version of Linux</a>, since the &ldquo;"
+#| "standard&rdquo; version contains non-free firmware &ldquo;blobs&rdquo;.  "
+#| "If this were part of the GNU Project, it could be considered &ldquo;GNU "
+#| "Linux&rdquo;; but we would not want to call it that, because it would be "
+#| "too confusing."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
-"free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/project/";
-"linux\">separate version of Linux</a>, since the &ldquo;standard&rdquo; "
-"version contains non-free firmware &ldquo;blobs&rdquo;.  If this were part "
-"of the GNU Project, it could be considered &ldquo;GNU Linux&rdquo;; but we "
-"would not want to call it that, because it would be too confusing."
+"free GNU/Linux distros do have a <a href=\"https://directory.fsf.org/wiki/";
+"Linux-libre\">separate version of Linux</a>, since the &ldquo;"
+"standard&rdquo; version contains nonfree firmware &ldquo;blobs&rdquo;.  If "
+"this were part of the GNU Project, it could be considered &ldquo;GNU "
+"Linux&rdquo;; but we would not want to call it that, because it would be too "
+"confusing."
 msgstr ""
 "نحن لا نتحدث عن نسخة غنو من النواة لينكس. 
لتوزيعات غنو/لينكس الحرة <a href="
 "\"http://directory.fsf.org/project/linux\";>نسخة خاصة من 
لينكس</a> لأن النسخة "
@@ -1893,7 +1931,7 @@
 "كانت جزءًا من مشروع غنو،  لأمكن تسميتها 
&rdquo;غنو لينكس&ldquo;، لكننا لا "
 "نريد أن نسميها بهذا، لأن هذا محير جدًا."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We're talking about a version of GNU, the operating system, distinguished by "
 "having Linux as the kernel.  A slash fits the situation because it means "
@@ -1905,7 +1943,7 @@
 "&rdquo;إدخال/إخراج&ldquo;.) هذا النظام هو جمع بين 
غنو ولينكس، ولذلك فإن اسمه "
 "&rdquo;غنو/لينكس&ldquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are other ways to express &ldquo;combination&rdquo;.  If you think "
 "that a plus-sign is clearer, please use that.  In French, a hyphen is clear: "
@@ -1916,7 +1954,7 @@
 "أوضح، فمن فضلك استخدمها. في الإسبانية 
الشرطة المرتفعة واضحة: &rdquo;غنو-"
 "لينكس&ldquo;. في الإسبانية، نقول أحيانًا 
&rdquo;غنو كون لينكس&ldquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Should we say &ldquo;GNU/BSD&rdquo; too?-]{+How is the name
 # | &ldquo;GNU/Linux&rdquo; pronounced?+} <span
 # | class=\"anchor-reference-id\">(<a [-href=\"#bsd\">#bsd</a>)</span>-]
@@ -1932,14 +1970,14 @@
 "هل يفترض أن نقول &rdquo;غنو/BSD&ldquo; أيضًا؟ <span 
class=\"anchor-reference-"
 "id\">(<a href=\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please pronounce it as &ldquo;GNU slash Linux.&rdquo; If you don't pronounce "
 "the slash, people will think you are saying &ldquo;GNU Linux,&rdquo; which "
 "is <a href=\"#whyslash\">not a suitable name for the combination</a>."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | Why do you write [-&ldquo;GNU/Linux&rdquo; instead of-] &ldquo;GNU
 # | [-Linux&rdquo;?-] {+Emacs&rdquo; rather than &ldquo;GNU/Emacs&rdquo;?+}
 # | <span class=\"anchor-reference-id\">(<a
@@ -1958,7 +1996,7 @@
 "لماذا تكتبون &rdquo;غنو/لينكس&ldquo; بدلا من 
&rdquo;غنو لينكسx&ldquo;؟ <span "
 "class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 # | Following the rules of English, in the construction &ldquo;GNU
 # | [-Linux&rdquo;-] {+Emacs&rdquo;+} the word &ldquo;GNU&rdquo; modifies
 # | [-&ldquo;Linux&rdquo;.  This can mean either &ldquo;GNU's version of
@@ -1982,14 +2020,14 @@
 "غنو من لينكس&ldquo; أو &rdquo;حزمة لينكس التابعة 
لغنو&ldquo;، وكلا المعنيين "
 "خاطئ."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;GNU/Emacs&rdquo; would mean the combination of GNU, the operating "
 "system, and the program Emacs.  That doesn't fit this program, so &ldquo;GNU/"
 "Emacs&rdquo; is the wrong way to refer to it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why &ldquo;GNU/Linux&rdquo; rather than &ldquo;Linux/GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
@@ -1997,7 +2035,7 @@
 "لماذا &rdquo;غنو/لينكس&ldquo; بدلا من 
&rdquo;لينكس/غنو&ldquo;؟ <span class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is right and proper to mention the principal contribution first.  The GNU "
 "contribution to the system is not only bigger than Linux and prior to Linux, "
@@ -2006,13 +2044,13 @@
 "من الأصوب ذكر المساهم الرئيسي أولا. مساهمة 
غنو إلى النظام ليست أكبر من لينكس "
 "فحسب بل أقدم. في الحقيقة لقد بدأنا الحركة 
كلها."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the lowest "
 "level of the system and GNU fills technically higher levels."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
 "lot better than what people usually do, which is to omit GNU entirely and "
@@ -2022,7 +2060,7 @@
 "يفعله الناس عادة، وهو تجاهل غنو تمامًا 
وتسمية النظام بطريقة تحوي أنه بالكامل "
 "لينكس."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
 "say anything about what the system consists of.  Why shouldn't they call it "
@@ -2030,21 +2068,21 @@
 "\"#distronames0\">#distronames0</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling a system &ldquo;Foobar Linux&rdquo; implies that it's a flavor of "
 "&ldquo;Linux,&rdquo; and people <a href=\"#distronames\">understand it that "
 "way</a>."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If they called a GNU/Linux distro &ldquo;Foobar BSD,&rdquo; you would call "
 "that a mistake.  &ldquo;This system is not BSD,&rdquo; you would tell them.  "
 "Well, it's not Linux either."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro is called &ldquo;Foobar Linux&rdquo;; doesn't that show it's "
 "really Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
@@ -2053,7 +2091,7 @@
 "اسم توزيعتي &rdquo;س لينكس&ldquo;، ألا يعني هذا 
أنها فعلا لينكس؟ <span class="
 "\"anchor-reference-id\">(<a href=\"#distronames\">#distronames</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 # | It means that the people who make the &ldquo;Foobar Linux&rdquo; distro
 # | are repeating the common mistake. {+We appreciate that distributions like
 # | Debian, Dragora, Musix, Trisquel, and Venenux have adopted GNU/Linux as
@@ -2072,7 +2110,7 @@
 msgstr ""
 "هذا يعني أن الذين أنشؤوا توزيعة &rdquo;س 
لينكس&ldquo; يكررون الخطأ الشائع."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's official name is &ldquo;Foobar Linux&rdquo;; isn't it wrong to "
 "call the distro anything but &ldquo;Foobar Linux&rdquo;? <span class="
@@ -2082,7 +2120,7 @@
 "&rdquo;س لينكس&ldquo;؟ <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames1\">#distronames1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 # | [-If it's allowed for them to change-]{+When they spread misinformation by
 # | changing+} &ldquo;GNU&rdquo; to {+&ldquo;Linux&rdquo;, and call their
 # | version of it+} &ldquo;Foobar Linux&rdquo;, it's [-allowed-] {+proper+}
@@ -2106,7 +2144,7 @@
 "إلى ما كان عليه وتسمية التوزيعة &rdquo;س 
غنو/لينكس&ldquo;. تصحيح الخطأ ليس "
 "أسوأ من القيام به."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be more effective to ask companies such as Mandrake, Red Hat and "
 "IBM to call their distributions &ldquo;GNU/Linux&rdquo; rather than asking "
@@ -2117,7 +2155,7 @@
 "توزيعاتها &rdquo;غنو/لينكس&ldquo; بدلا من أن 
تطلبوا من الأفراد؟ <span class="
 "\"anchor-reference-id\">(<a href=\"#companies\">#companies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It isn't a choice of one or the other&mdash;we ask companies and "
 "organizations and individuals to help spread the word about this.  In fact, "
@@ -2134,7 +2172,7 @@
 "بحت؛ نحن نتوقع كسب المزيد من المال بتسميته 
&rdquo;لينكس&ldquo;&ldquo;. "
 "بعبارة أخرى، لم تكترث الشركة بما هو صائب."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We can't make them do this right, but we're not the sort to give up just "
 "because the road isn't easy.  You may not have as much influence at your "
@@ -2147,7 +2185,7 @@
 "المساعدة. نستطيع معا تغيير الحال لتربح 
الشركة بتسميته &rdquo;غنو/"
 "لينكس&ldquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to reserve the name &ldquo;GNU/Linux&rdquo; for "
 "distributions that are purely free software? After all, that is the ideal of "
@@ -2158,15 +2196,35 @@
 "هذه مبادئ غنو. <span class=\"anchor-reference-id\">(<a 
href=\"#reserve"
 "\">#reserve</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+# | The widespread practice of adding non[---]free software to the GNU/Linux
+# | system is a major problem for our community.  It teaches the users that
+# | non[---]free software is ok, and that using it is part of the spirit of
+# | &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of
+# | their mission to help users use non[---]free add-ons, and may even invite
+# | salesmen to come and make sales pitches for them.  They adopt goals such
+# | as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them
+# | use non[---]free applications and drivers), or making the system more
+# | popular even at the cost of freedom.
+#, fuzzy
+#| msgid ""
+#| "The widespread practice of adding non-free software to the GNU/Linux "
+#| "system is a major problem for our community.  It teaches the users that "
+#| "non-free software is ok, and that using it is part of the spirit of "
+#| "&ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part "
+#| "of their mission to help users use non-free add-ons, and may even invite "
+#| "salesmen to come and make sales pitches for them.  They adopt goals such "
+#| "as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them "
+#| "use non-free applications and drivers), or making the system more popular "
+#| "even at the cost of freedom."
 msgid ""
-"The widespread practice of adding non-free software to the GNU/Linux system "
-"is a major problem for our community.  It teaches the users that non-free "
+"The widespread practice of adding nonfree software to the GNU/Linux system "
+"is a major problem for our community.  It teaches the users that nonfree "
 "software is ok, and that using it is part of the spirit of &ldquo;"
 "Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of their "
-"mission to help users use non-free add-ons, and may even invite salesmen to "
+"mission to help users use nonfree add-ons, and may even invite salesmen to "
 "come and make sales pitches for them.  They adopt goals such as &ldquo;"
-"helping the users&rdquo; of GNU/Linux (including helping them use non-free "
+"helping the users&rdquo; of GNU/Linux (including helping them use nonfree "
 "applications and drivers), or making the system more popular even at the "
 "cost of freedom."
 msgstr ""
@@ -2178,11 +2236,11 @@
 "مستخدمي&ldquo; غنو/لينكس (بما في ذلك مساعدتهم 
في تثبيت تطبيقات وتعريفات غير "
 "حرة)، أو جعل النظام مشهورًا حتى ولو على 
حساب الحرية."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The question is how to try to change this."
 msgstr "القضية هي كيف يمكننا تغيير ذلك."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Given that most of the community which uses GNU with Linux already does not "
 "realize that's what it is, for us to disown these adulterated versions, "
@@ -2195,13 +2253,29 @@
 "تصلهم الرسالة التي نحملها. كل ما سيقولونه 
أنهم لم يعلموا أن تلك الأنظمة كانت "
 "أساسًا غنو."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The way to lead these users to see a connection with freedom is exactly
+# | the opposite: to inform them that all these system versions <em>are</em>
+# | versions of GNU, that they all are based on a system that exists
+# | specifically for the sake of the users' freedom.  With this understanding,
+# | they can start to recognize the distributions that include non[---]free
+# | software as perverted, adulterated versions of GNU, instead of thinking
+# | they are proper and appropriate &ldquo;versions of Linux&rdquo;.
+#, fuzzy
+#| msgid ""
+#| "The way to lead these users to see a connection with freedom is exactly "
+#| "the opposite: to inform them that all these system versions <em>are</em> "
+#| "versions of GNU, that they all are based on a system that exists "
+#| "specifically for the sake of the users' freedom.  With this "
+#| "understanding, they can start to recognize the distributions that include "
+#| "non-free software as perverted, adulterated versions of GNU, instead of "
+#| "thinking they are proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgid ""
 "The way to lead these users to see a connection with freedom is exactly the "
 "opposite: to inform them that all these system versions <em>are</em> "
 "versions of GNU, that they all are based on a system that exists "
 "specifically for the sake of the users' freedom.  With this understanding, "
-"they can start to recognize the distributions that include non-free software "
+"they can start to recognize the distributions that include nonfree software "
 "as perverted, adulterated versions of GNU, instead of thinking they are "
 "proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgstr ""
@@ -2211,7 +2285,7 @@
 "التي تحتوي برمجيات غير حرة مخطئة ونسخًا م
غشوشة من غنو، بدلا من أن يعتقدون "
 "أنها نسخ صحيحة وملائمة من &rdquo;لينكس&ldquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is very useful to start GNU/Linux User Groups, which call the system GNU/"
 "Linux and adopt the ideals of the GNU Project as a basis for their "
@@ -2227,7 +2301,7 @@
 "المجموعة لتغيير توجهها (واسمها) أو أن تبدأ 
مجموعة جديدة. إن للذين يأخذون "
 "الأمور من منطلق سطح حق في تبني ذلبك الم
نهج، لكن احذر من أن يجروك معهم."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not make a GNU distribution of Linux (sic) and call that GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
@@ -2237,7 +2311,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "All the &ldquo;Linux&rdquo; distributions are actually versions of the GNU "
 "system with Linux as the kernel.  The purpose of the term &ldquo;GNU/"
@@ -2249,7 +2323,7 @@
 "له. اقتراح الاسم &rdquo;غنو/لينكس&ldquo; هو للربط 
بينهما. تطوير توزيعة جديدة "
 "وتسميتها (وحدها) &rdquo;غنو/لينكس&ldquo; سوف يشوش 
المقصد الذي نريد توضيحه."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "As for developing a distribution of GNU/Linux, we already did this once, "
 "when we funded the early development of Debian GNU/Linux.  To do it again "
@@ -2262,7 +2336,7 @@
 "يتطلب الكثير من الجهد، ومالم تحتوي 
التوزيعة الجديدة على مزايا عملية مهمة فلا "
 "فائدة منه."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Instead we help the developers of 100% free GNU/Linux distributions, such as "
 "gNewSense and Ututo."
@@ -2270,7 +2344,7 @@
 "بدلا من فضلك، ساعدنا مطوري توزيعات 
غنو/لينكس الحرة بنسبة 100% مثل غنيوسنس و "
 "Ututo."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not just say &ldquo;Linux is the GNU kernel&rdquo; and release some "
 "existing version of GNU/Linux under the name &ldquo;GNU&rdquo;? <span class="
@@ -2280,7 +2354,7 @@
 "غنو/لينكس باسم &rdquo;غنو&ldquo;؟ <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#linuxgnu\">#linuxgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It might have been a good idea to adopt Linux as the GNU kernel back in "
 "1992.  If we had realized, then, how long it would take to get the GNU Hurd "
@@ -2290,7 +2364,7 @@
 "الحين مقدار العمل المطلوب للنتهاء من غنو 
هرد فلربما قمنا بذلك . (ولكن فات "
 "الأوان)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we were to take an existing version of GNU/Linux and relabel it as &ldquo;"
 "GNU&rdquo;, that would be somewhat like making a version of the GNU system "
@@ -2300,7 +2374,7 @@
 "أخذ نسخة ن غنو/لينكس وتسميتها &rdquo;غنو&ldquo; م
شابه لأخذ نسخة من نظام غنو "
 "وتسميتها &rdquo;لينكس&ldquo;. إنها ليست فكرة م
لائمة، ونحن لا نحب انتهاجها."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Did the GNU Project condemn and oppose use of Linux in the early days? <span "
 "class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
@@ -2308,7 +2382,7 @@
 "هل رفض مشروع غنو وعارض لينكس في أيامها 
الأولى؟ <span class=\"anchor-"
 "reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We did not adopt Linux as our kernel, but we didn't condemn or oppose it.  "
 "In 1993 we started discussing the arrangements to sponsor the development of "
@@ -2324,7 +2398,7 @@
 "الإصدارات الرسمية من تلك الحزم لتعمل حزم 
غنو مباشرة (بدون تغيير أو إعداد) مع "
 "لينكس، لكن كثيرا من التعديلات لم تكن محم
ولة واحتاجت إلى تعديل."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who had made the changes showed little interest in cooperating "
 "with us.  One of them actually told us that he didn't care about working "
@@ -2340,7 +2414,7 @@
 "معنا لتضمين تعديلاتهم. لكن وعلى الرغم من 
أن هؤلاء كانوا يطورون نظامًا مبنيًا "
 "بشكل أساسي على غنو كانوا أول (ولازالوا 
الوحيدين) الذين رفضوا العمل معنا."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It was this experience that first showed us that people were calling a "
 "version of the GNU system &ldquo;Linux&rdquo;, and that this confusion was "
@@ -2353,7 +2427,7 @@
 "نحاول علاج هذه المشكلة وغيرها من المشاكل 
التي يسببها اسم &rdquo;لينكس&ldquo; "
 "الخاطئ."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why did you wait so long before asking people to use the name GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
@@ -2361,7 +2435,7 @@
 "لماذا تأخرتم كثيرًا في طلب تسميته 
غنو/لينكس؟ <span class=\"anchor-reference-id"
 "\">(<a href=\"#wait\">#wait</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually we didn't.  We began talking privately with developers and "
 "distributors about this in 1994, and made a more public campaign in 1996.  "
@@ -2371,7 +2445,7 @@
 "الموضوع في عام 1994، وبدأنا حملة عامة في عام 
1996. وسوف نواصلها متى ما لزم "
 "الأمر."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should the GNU/<i>name</i> convention be applied to all programs that are "
 "GPL'ed? <span class=\"anchor-reference-id\">(<a href=\"#allgpled"
@@ -2380,7 +2454,7 @@
 "هل ينبغي أن تسمى كل البرامج الخاضعة لجي بي 
إل بغنو/<i>الاسم</i>؟ <span class="
 "\"anchor-reference-id\">(<a href=\"#allgpled\">#allgpled</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We never refer to individual programs as &ldquo;GNU/<i>name</i>&rdquo;.  "
 "When a program is a GNU package, we may call it &ldquo;GNU <i>name</"
@@ -2389,7 +2463,7 @@
 "لم نسمِ أبدًا برامج منفردة &rdquo;غنو/<i>الاسم
</i>&ldquo;. عندما يكون البرنامج "
 "حزمة غنو فقد نطلق عليه اسم &rdquo;غنو <i>الاسم
</i>&ldquo;"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU, the operating system, is made up of many different programs.  Some of "
 "the programs in GNU were written as part of the GNU Project or specifically "
@@ -2400,7 +2474,7 @@
 "مشروع غنو أو ساهم بها مطوروها إليه، إن هذه 
هي حزم غنو ونستخدم عادة اسم "
 "&rdquo;غنو&ldquo; في أسمائها."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It's up to the developers of a program to decide if they want to contribute "
 "it and make it a GNU package.  If you have developed a program and you would "
@@ -2412,7 +2486,7 @@
 "إذا طورت برنامجًا وأردته أن يكون حزمة غنو، 
فمن فضلك راسل <a href=\"mailto:";
 "gnu@gnu.org\">&lt;gnu@gnu.org&gt;</a>، لنقيمه ونقرر فيما 
إذا كنا نرغب به."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It wouldn't be fair to put the name GNU on every individual program that is "
 "released under the GPL.  If you write a program and release it under the "
@@ -2430,7 +2504,7 @@
 "حزمة غنو، فلا يمكن أن يُنسب إلى مشروع غنو، 
ووضع &rdquo;غنو&ldquo; في اسمه لن "
 "يكون ملائمًا."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In contrast, we do deserve the overall credit for the GNU operating system "
 "as a whole, even though not for each and every program in it.  The system "
@@ -2441,7 +2515,7 @@
 "مفردة. وُجد النظام بسبب قرارانا وعزمنا منذ 
عام 1984 وقبل بدء لينكس بسنوات "
 "طوال."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The operating system in which Linux became popular was basically the same as "
 "the GNU operating system.  It was not entirely the same, because it had a "
@@ -2452,7 +2526,7 @@
 "مطابقًا له تمامًا لأنه احتوى نواة أخرى، 
لكنه كان شبيهًا جدًا به. كان أحد تنويعات "
 "نظام غنو. كان نظام غنو/لينكس."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux continues to be used primarily in derivatives of that system&mdash;in "
 "today's versions of the GNU/Linux system.  What gives these systems their "
@@ -2462,7 +2536,7 @@
 "استمر استخدام لينكس في النسخ المشتقة من 
النظام وهي النسخ التي نراها اليوم من "
 "نظام غنو/لينكس. ما يميز هذه الأنظمة أن غنو 
ولينكس أصلهما، وليس لينكس وحدها."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since much of GNU comes from Unix, shouldn't GNU give credit to Unix by "
 "using &ldquo;Unix&rdquo; in its name? <span class=\"anchor-reference-id\">"
@@ -2472,7 +2546,7 @@
 "يونكس بإضافة  &rdquo;يونكس&ldquo; إلى الاسم؟ <span 
class=\"anchor-reference-"
 "id\">(<a href=\"#unix\">#unix</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Actually, none of GNU comes from Unix.  Unix was proprietary software (and "
 "still is), so using any of its code in GNU would have been illegal.  This is "
@@ -2487,7 +2561,7 @@
 "الحقبة الأخرى لأنك لم تملك حرية استخدامها. 
لم يكن بمقدورنا نسخ برامج يونكس "
 "أو حتى أجزاء منها، لقد كتبنا كل شيء من 
الصفر."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "No code in GNU comes from Unix, but GNU is a Unix-compatible system; "
 "therefore, many of the ideas and specifications of GNU do come from Unix.  "
@@ -2500,13 +2574,29 @@
 "ل&rdquo;غنو ليس يونكس&ldquo;) يمثل عادة 
الاختصارات المتداخلة التي بدأت في "
 "الثمانينات."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.
+# |  The author of TINT wrote another implementation of TECO (there were
+# | already many of them, for various systems), but instead of calling it by a
+# | dull name like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of
+# | a clever amusing name.  (That's what hacking means: <a
+# | href=\"http{+s+}://stallman.org/articles/on-hacking.html\">playful
+# | cleverness</a>.)
+#, fuzzy
+#| msgid ""
+#| "The first such recursive acronym was TINT, &ldquo;TINT Is Not "
+#| "TECO&rdquo;.  The author of TINT wrote another implementation of TECO "
+#| "(there were already many of them, for various systems), but instead of "
+#| "calling it by a dull name like &ldquo;<em>somethingorother</em> "
+#| "TECO&rdquo;, he thought of a clever amusing name.  (That's what hacking "
+#| "means: <a href=\"http://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
 "The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
 "The author of TINT wrote another implementation of TECO (there were already "
 "many of them, for various systems), but instead of calling it by a dull name "
 "like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of a clever "
-"amusing name.  (That's what hacking means: <a href=\"http://stallman.org/";
+"amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
 "أول اختصار متداخل كانت TINT من &rdquo;TINT Is Not 
TECO&ldquo;، فلقد حاكى "
@@ -2514,7 +2604,7 @@
 "من أن يسميها &rdquo;شيء TECO&ldquo;، قرر العبث 
بالاسم. (وهذا عمل الهاكرز: <a "
 "href=\"http://stallman.org/articles/on-hacking.html\";>الذكاء الم
رح</a>)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Other hackers enjoyed that name so much that we imitated the approach.  It "
 "became a tradition that, when you were writing from scratch a program that "
@@ -2529,7 +2619,7 @@
 "&rdquo;MINK&ldquo; الذي يعني &rdquo;MINK Is Not Klever&ldquo;. من 
هذا "
 "المنطلق سمينا بدلينا ليونكس &rdquo;GNU's Not 
Unix&ldquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Historically, AT&amp;T which developed Unix did not want anyone to give it "
 "credit by using &ldquo;Unix&rdquo; in the name of a similar system, not even "
@@ -2544,7 +2634,7 @@
 "السبب، فإن كل نسخ يونكس المعدلة (وكلها 
احتكاري مثل يونكس) لها اسم مختلف "
 "تمامًا لا يتضمن &rdquo;يونكس&ldquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we say &ldquo;GNU/BSD&rdquo; too? <span class=\"anchor-reference-id\">"
 "(<a href=\"#bsd\">#bsd</a>)</span>"
@@ -2552,7 +2642,7 @@
 "هل يفترض أن نقول &rdquo;غنو/BSD&ldquo; أيضًا؟ <span 
class=\"anchor-reference-"
 "id\">(<a href=\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems, "
 "because that term does not fit the history of the BSD systems."
@@ -2560,9 +2650,19 @@
 "نحن لا نسمي أنظمة BSD (مثل FreeBSD وغيره) أنظمة  
&rdquo;غنو/BSD&ldquo; لأن "
 "الاسم لا يناسب تاريخ أنظمة BSD."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The BSD system was developed by UC Berkeley as non[---]free software in
+# | the 80s, and became free in the early 90s.  A free operating system that
+# | exists today is almost certainly either a variant of the GNU system, or a
+# | kind of BSD system.
+#, fuzzy
+#| msgid ""
+#| "The BSD system was developed by UC Berkeley as non-free software in the "
+#| "80s, and became free in the early 90s.  A free operating system that "
+#| "exists today is almost certainly either a variant of the GNU system, or a "
+#| "kind of BSD system."
 msgid ""
-"The BSD system was developed by UC Berkeley as non-free software in the 80s, "
+"The BSD system was developed by UC Berkeley as nonfree software in the 80s, "
 "and became free in the early 90s.  A free operating system that exists today "
 "is almost certainly either a variant of the GNU system, or a kind of BSD "
 "system."
@@ -2571,7 +2671,7 @@
 "حرًا حوالي عام 1990. كل أنظمة التشغيل الحرة 
الموجودة اليوم هي إما إحدى "
 "تنويعات نظام غنو أو أحد أنواع نظام BSD."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "People sometimes ask whether BSD too is a variant of GNU, as GNU/Linux is.  "
 "It is not.  The BSD developers were inspired to make their code free "
@@ -2583,7 +2683,7 @@
 "مطورو BSD بجعل كودهم حرًّا بمشروع غنو، ومن 
الواضح أن التماسات مشروع غنو ساهمت "
 "في اقناعهم، لكن الكود تداخل إلى حدٍ ما مع 
غنو."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "BSD systems today use some GNU packages, just as the GNU system and its "
 "variants use some BSD programs; however, taken as wholes, they are two "
@@ -2595,7 +2695,7 @@
 "BSD، لكن بالحكم على القضية ككل، هما نظامي 
تشغيل مختلفين طُورا بشكل منفصل. لم "
 "يكتب مطورو BSD نواة ويضيفوها إلى نظام غنو، 
لذا فاسم غنو/BSD لن يلائم الوضع."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The connection between GNU/Linux and GNU is much closer, and that's why the "
 "name &ldquo;GNU/Linux&rdquo; is appropriate for it."
@@ -2603,7 +2703,7 @@
 "الصلة بين غنو/لينكس وغنو أقرب بكثير، ولهذا 
فإن اسم &rdquo;غنو/لينكس&ldquo; "
 "ملائم له."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is a version of GNU which uses the kernel from NetBSD.  Its developers "
 "call it &ldquo;Debian GNU/NetBSD&rdquo;, but &ldquo;GNU/"
@@ -2616,7 +2716,7 @@
 "النظام الكامل، وليس النواة وحدها. تلك ليست 
نظام BSD، لأن معظم مكونات النظام "
 "شبيهة بنظام غنو/لينكس."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "If I install the GNU tools on Windows, does that mean I am running a GNU/"
 "Windows system? <span class=\"anchor-reference-id\">(<a href=\"#othersys"
@@ -2626,7 +2726,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#othersys\">#othersys</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
 "GNU are just a part of the GNU software, which is just a part of the GNU "
@@ -2638,7 +2738,7 @@
 "جزء من برمجيات غنو التي تمثل بدورها جزء من 
نظام غنو، وتحتها نظام تشغيل "
 "متكامل آخر ليس ذا صلة بغنو. هذه حالة مختلفة 
تمامًا عن غنو/لينكس."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can't Linux be used without GNU? <span class=\"anchor-reference-id\">(<a "
 "href=\"#justlinux\">#justlinux</a>)</span>"
@@ -2646,7 +2746,7 @@
 "ألا توجد أنظمة لينكس بدون غنو؟ <span 
class=\"anchor-reference-id\">(<a href="
 "\"#justlinux\">#justlinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 # | [-It is possible to make a system that uses-]Linux [-as the kernel but-]
 # | is [-not based on GNU.  I'm told there are small systems,-] used [-for
 # | embedded development, that include Linux but not the GNU system.  IBM was
@@ -2719,19 +2819,19 @@
 "لينكس هي نواته. هذه الأسماء المختلفة سوف 
تظهر الفرق بين تلك الأنظمة "
 "للمستخدمين.</p>"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How much of the GNU system is needed for the system to be GNU/Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "&ldquo;How much&rdquo; is not a meaningful question because the GNU system "
 "does not have precise boundaries."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is an operating system maintained by a community.  It includes far more "
 "than just the GNU software packages (of which we have a specific list), and "
@@ -2741,35 +2841,35 @@
 "much&rdquo; you used."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we look at the level of packages, Linux is one important package in the "
 "GNU/Linux system.  The inclusion of one important GNU package is enough to "
 "justify our request for equal mention."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Are there complete Linux systems [sic] without GNU? <span class=\"anchor-"
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
 "span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There are complete systems that contain Linux and not GNU; Android is an "
 "example.  But it is a mistake to call them &ldquo;Linux&rdquo; systems, just "
 "as it is a mistake to call GNU a &ldquo;Linux&rdquo; system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android is very different from the GNU/Linux system&mdash;because the two "
 "have very little code in common.  In fact, the only thing they have in "
 "common is Linux."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
 "necessary to say things like, &ldquo;Android contains Linux, but it isn't "
@@ -2777,7 +2877,7 @@
 "[meaning the GNU system].&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android contains just as much of Linux as GNU/Linux does.  What it doesn't "
 "have is the GNU system.  Android replaces that with Google software that "
@@ -2785,7 +2885,7 @@
 "absence of GNU."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Why not just-]{+Is it correct to+} say [-&ldquo;Linux is the GNU
 # | kernel&rdquo; and release some existing version of-] {+&ldquo;using
 # | Linux&rdquo; if it refers to using+} GNU/Linux [-under the name
@@ -2809,27 +2909,27 @@
 "غنو/لينكس باسم &rdquo;غنو&ldquo;؟ <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#linuxgnu\">#linuxgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Far from it.  That usage is so strained that people will not understand the "
 "intended meaning."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public will find it very strange to speak of using Android as &ldquo;"
 "using Linux&rdquo;.  It's like having a conversation, then saying you were "
 "conversing with the person's intestines or the person's circulatory system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public <em>will</em> understand the idea of &ldquo;using Linux&rdquo; "
 "when it's really GNU/Linux, by way of the usual misunderstanding: thinking "
 "of the whole system as &ldquo;Linux&rdquo;."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Use of Android and use of GNU/Linux are totally different, as different as "
 "driving a car and riding a bicycle.  The fact that the first two both "
@@ -2842,7 +2942,7 @@
 "GNU/Linux and Android.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not call the system &ldquo;Linux&rdquo; anyway, and strengthen Linus "
 "Torvalds' role as posterboy for our community? <span class=\"anchor-"
@@ -2852,7 +2952,7 @@
 "الرامز لمجتمعنا؟ <span class=\"anchor-reference-id\">(<a 
href=\"#helplinus"
 "\">#helplinus</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Linus Torvalds is the &ldquo;posterboy&rdquo; (other people's choice of "
 "word, not ours) for his goals, not ours.  His goal is to make the system "
@@ -2869,12 +2969,30 @@
 "كمبدأ أخلاقي، ولهذا فإن العامة لا يربطون 
بين الاسم &rdquo;لينكس&ldquo; وبين "
 "ذلك المبدأ."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | Linus publicly states his disagreement with the free software movement's
+# | ideals.  He developed non[---]free software in his job for many years (and
+# | said so to a large audience at a &ldquo;Linux&rdquo;World show), and
+# | publicly invited fellow developers of Linux, the kernel, to use
+# | non[---]free software to work on it with him.  He goes even further, and
+# | rebukes people who suggest that engineers and scientists should consider
+# | social consequences of our technical work&mdash;rejecting the lessons
+# | society learned from the development of the atom bomb.
+#, fuzzy
+#| msgid ""
+#| "Linus publicly states his disagreement with the free software movement's "
+#| "ideals.  He developed non-free software in his job for many years (and "
+#| "said so to a large audience at a &ldquo;Linux&rdquo;World show), and "
+#| "publicly invited fellow developers of Linux, the kernel, to use non-free "
+#| "software to work on it with him.  He goes even further, and rebukes "
+#| "people who suggest that engineers and scientists should consider social "
+#| "consequences of our technical work&mdash;rejecting the lessons society "
+#| "learned from the development of the atom bomb."
 msgid ""
 "Linus publicly states his disagreement with the free software movement's "
-"ideals.  He developed non-free software in his job for many years (and said "
+"ideals.  He developed nonfree software in his job for many years (and said "
 "so to a large audience at a &ldquo;Linux&rdquo;World show), and publicly "
-"invited fellow developers of Linux, the kernel, to use non-free software to "
+"invited fellow developers of Linux, the kernel, to use nonfree software to "
 "work on it with him.  He goes even further, and rebukes people who suggest "
 "that engineers and scientists should consider social consequences of our "
 "technical work&mdash;rejecting the lessons society learned from the "
@@ -2887,7 +3005,7 @@
 "اهتمام المهندسين والعلماء بالعواقب الاجتم
اعية للعمل الفني الذي يقومون به؛ "
 "الأمر الذي يجحد الدروس الاجتماعية التي 
تعلمانها من تطوير القنبلة الذرية."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with writing a free program for the motivations of "
 "learning and having fun; the kernel Linus wrote for those reasons was an "
@@ -2904,7 +3022,7 @@
 "إلى معرفة ذلك. لليوناس حق التعبير عن 
آرائه، لكن الناس يجب أن يعوا أن نظام "
 "التشغيل الذي نتحدث عنه نشأ عن مبدأ الحرية، 
وليس عن الآراء التي يتبناها."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong for us to label Linus Torvalds' work as GNU? <span class="
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
@@ -2912,7 +3030,7 @@
 "أليس من الخطأ أن نرمز لعمل تورفلدز بغنو؟ 
<span class=\"anchor-reference-id\">"
 "(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong, so we don't do that.  Torvalds' work is Linux, the "
 "kernel; we are careful not to attribute that work to the GNU Project or "
@@ -2924,7 +3042,7 @@
 "غنو&ldquo;. عندما نتحدث عن النظام الكامل، فإن 
اسم &rdquo;غنو/لينكس&ldquo; "
 "ينسب إليه جزءًا من العمل."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Does Linus Torvalds agree that Linux is just the kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
@@ -2932,10 +3050,23 @@
 "هل يتفق ليوناس تورفلدز على أن لينكس هي 
النواة فحسب؟ <span class=\"anchor-"
 "reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | He recognized this at the beginning.  The earliest Linux release notes
+# | said, <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | &ldquo;Most of the tools used with linux are GNU software and are under
+# | the GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
+# |  for more info&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
+#| "versions/RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are "
+#| "GNU software and are under the GNU copyleft. These tools aren't in the "
+#| "distribution - ask me (or GNU)  for more info&rdquo;</a>."
 msgid ""
 "He recognized this at the beginning.  The earliest Linux release notes said, "
-"<a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"<a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
 "RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are GNU software "
 "and are under the GNU copyleft. These tools aren't in the distribution - ask "
 "me (or GNU)  for more info&rdquo;</a>."
@@ -2946,29 +3077,29 @@
 "تحت حقوق غنو المتروكة. هذه الأدوات ليست في 
التوزيعة - اسألني (أو اسأل غنو) "
 "لمزيد من المعلومات.&ldquo;</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not finish the GNU Hurd kernel, release the GNU system as a whole, and "
 "forget the question of what to call GNU/Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#finishhurd\">#finishhurd</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We would like credit for the GNU operating system no matter which kernel is "
 "used with it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Making the GNU Hurd work well enough to compete with Linux would be a big "
 "job, and it's not clearly necessary.  The only thing ethically wrong with "
 "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the best "
-"fix for that problem is <a href=\"http://fsf.org/campaigns/priority-projects";
-"\"> developing free replacement for the blobs</a>."
+"fix for that problem is <a href=\"https://www.fsf.org/campaigns/priority-";
+"projects\"> developing free replacement for the blobs</a>."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The battle is already lost&mdash;society has made its decision and we can't "
 "change it, so why even think about it? <span class=\"anchor-reference-id\">"
@@ -2978,7 +3109,7 @@
 "تخططون أصلا لذلك؟ <span class=\"anchor-reference-id\">(<a 
href=\"#lost"
 "\">#lost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This isn't a battle, it is a campaign of education.  What to call the system "
 "is not a single decision, to be made at one moment by &ldquo;society&rdquo;: "
@@ -2992,7 +3123,7 @@
 "لا يمكن لأحد أن يفرض تسمية 
&rdquo;غنو/لينكس&ldquo;، لكن يمكنك أنت أن تسمي "
 "النظام &rdquo;غنو/لينكس&ldquo; بنفسك وبفعل ذلك، 
أنت تساهم في تعليم الآخرين."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Society has made its decision and we can't change it, so what good does it "
 "do if I say &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id\">(<a "
@@ -3002,7 +3133,7 @@
 "لينكس&ldquo;؟ <span class=\"anchor-reference-id\">(<a href=\"#whatgood"
 "\">#whatgood</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is not an all-or-nothing situation: correct and incorrect pictures are "
 "being spread more or less by various people.  If you call the system &ldquo;"
@@ -3020,7 +3151,7 @@
 "بضع مئات من الأشخاص تستخدم الاسم 
&rdquo;غنو/لينكس&ldquo;، فسوف تعلم عددًا "
 "كبيرًا من الناس بدون جهد كبير. وسوف ينشر 
بعضهم التصحيح للآخرين."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to call the system &ldquo;Linux&rdquo; and teach "
 "people its real origin with a ten-minute explanation? <span class=\"anchor-"
@@ -3030,7 +3161,7 @@
 "لا تتجاوز مدته عشر دقائق؟ <span 
class=\"anchor-reference-id\">(<a href="
 "\"#explain\">#explain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "If you help us by explaining to others in that way, we appreciate your "
 "effort, but that is not the best method.  It is not as effective as calling "
@@ -3040,7 +3171,7 @@
 "المثالية، فليس لها نفس تأثير تسمية النظام 
&rdquo;غنو/لينكس&ldquo;، وسوف يضيع "
 "وقتك بدون أثر كبير."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is ineffective because it may not sink in, and surely will not "
 "propagate.  Some of the people who hear your explanation will pay attention, "
@@ -3054,7 +3185,7 @@
 "يكرروا التوضيح للآخرين متى ما تحدثوا عن 
النظام. سوف يكتفون على الأرجح بتسمية "
 "&rdquo;لينكس&ldquo;، وبدون قصد منهم، سوف يساهمون 
في نشر الصورة الخاطئة."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is inefficient because it takes a lot more time.  Saying and writing "
 "&ldquo;GNU/Linux&rdquo; will take you only a few seconds a day, not minutes, "
@@ -3067,7 +3198,7 @@
 "أكثر بكثير هذه الطريقة. إن التفريق بين 
لينكس وغنو/لينكس عند الكتابة والحديث "
 "يعد أسهل وسيلة مؤثرة لمساعدة مشروع غنو."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people laugh at you when you ask them to call the system GNU/Linux.  "
 "Why do you subject yourself to this treatment? <span class=\"anchor-"
@@ -3077,7 +3208,7 @@
 "لهذه المعاملة؟ <span class=\"anchor-reference-id\">(<a 
href=\"#treatment"
 "\">#treatment</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; tends to give people a mistaken "
 "picture of the system's history and reason for existence.  People who laugh "
@@ -3090,7 +3221,7 @@
 "إنهم يعتقدون أن عملنا قام به ليوناس، ولذا 
فإنهم يسخرون من طلب نسبه إلينا. لو "
 "عرفوا الحقيقة فلن يسخروا غالبًا."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Why do we take the risk of making a request that sometimes leads people to "
 "ridicule us? Because often it has useful results that help the GNU Project.  "
@@ -3099,7 +3230,7 @@
 "لماذا نخاطر بأن نطلب طالبًا يجعل البعض 
أحيانًا يسخرون منا؟ السبب أنه له عادة "
 "نتائج إيجابية لمشروع غنو، سوف نخاطر بأن 
يعتدى علينا عن غير حق لنحقق أهدفانا."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you see such an ironically unfair situation occurring, please don't sit "
 "idly by.  Please teach the laughing people the real history.  When they see "
@@ -3108,7 +3239,7 @@
 "إذا لحظت حدوث حالة ظالمة، فمن فضلك لا تقف م
كتوف اليدين. علم الذين يسخرون "
 "التاريخ الحقيق. عندما يعون أن طلبنا عادل، 
فسوف يتوقف من لديه ضمير منهم."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people condemn you when you ask them to call the system GNU/Linux.  "
 "Don't you lose by alienating them? <span class=\"anchor-reference-id\">(<a "
@@ -3118,7 +3249,7 @@
 "لهذه المعاملة؟ <span class=\"anchor-reference-id\">(<a 
href=\"#alienate"
 "\">#alienate</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not much.  People who don't appreciate our role in developing the system are "
 "unlikely to make substantial efforts to help us.  If they do work that "
@@ -3133,7 +3264,7 @@
 "منهم ذلك. في نفس الوقت، هم يعيقون قدرتنا 
على مساعدة الآخرين بنسب عملنا إلى "
 "شخص آخر."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It makes no sense to worry about alienating people who are already mostly "
 "uncooperative, and it is self-defeating to be deterred from correcting a "
@@ -3144,7 +3275,7 @@
 "وسندمر أنفسنا إذا ردعونا عن تصحيح مشكلة 
كبيرة خشية أن ينزعج المرتكبون لها. "
 "لهذا سوف نواصل محاولة تصحيح الاسم الخاطئ."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Whatever you contributed, is it legitimate to rename the operating system? "
 "<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
@@ -3152,7 +3283,7 @@
 "أيحق لك تغيير الاسم أيًا كانت مساهمتك؟ <span 
class=\"anchor-reference-id\">"
 "(<a href=\"#rename\">#rename</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are not renaming anything; we have been calling this system &ldquo;"
 "GNU&rdquo; ever since we announced it in 1983.  The people who tried to "
@@ -3162,7 +3293,7 @@
 "عام 1983. إن الذين حاولوا تغيير اسمه إلى 
&rdquo;لينكس&ldquo; هم الذين كان "
 "عليهم ألا يقوموا بذلك."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong to force people to call the system &ldquo;GNU/Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
@@ -3170,7 +3301,7 @@
 "أليس خطأً أن نجبر الناس على تسمية النظام 
&rdquo;غنو/لينكس&ldquo;؟ <span class="
 "\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong to force them, and we don't try.  We call the system "
 "&ldquo;GNU/Linux&rdquo;, and we ask you to do it too."
@@ -3178,7 +3309,7 @@
 "إجبار الناس خطأ، ونحن لا نحاول إجبار أحد. 
نحن نسمي النظام &rdquo;غنو/"
 "لينكس&ldquo; ونطلب منك أن تفعل الأمر ذاته."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not sue people who call the whole system &ldquo;Linux&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
@@ -3186,7 +3317,7 @@
 "لماذا يسمي معظم الناس النظام 
&rdquo;لينكس&ldquo;؟ <span class=\"anchor-"
 "reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are no legal grounds to sue them, but since we believe in freedom of "
 "speech, we wouldn't want to do that anyway.  We ask people to call the "
@@ -3196,7 +3327,7 @@
 "على كل حال. نحن نطلب من الجميع تسمية النظام 
&rdquo;غنو/لينكس&ldquo; لأن هذا "
 "هو التصرف الصحيح."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Shouldn't you put something in the GNU GPL to require people to call the "
 "system &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id\">(<a href="
@@ -3206,13 +3337,31 @@
 "&rdquo;غنو&ldquo;؟ <span class=\"anchor-reference-id\">(<a 
href=\"#require"
 "\">#require</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
+# | The purpose of the GNU GPL is to protect the users' freedom from those who
+# | would make proprietary versions of free software.  While it is true that
+# | those who call the system &ldquo;Linux&rdquo; often do things that limit
+# | the users' freedom, such as bundling non[---]free software with the
+# | GNU/Linux system or even developing non[---]free software for such use,
+# | the mere act of calling the system &ldquo;Linux&rdquo; does not, in
+# | itself, deny users their freedom.  It seems improper to make the GPL
+# | restrict what name people can use for the system.
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU GPL is to protect the users' freedom from those "
+#| "who would make proprietary versions of free software.  While it is true "
+#| "that those who call the system &ldquo;Linux&rdquo; often do things that "
+#| "limit the users' freedom, such as bundling non-free software with the GNU/"
+#| "Linux system or even developing non-free software for such use, the mere "
+#| "act of calling the system &ldquo;Linux&rdquo; does not, in itself, deny "
+#| "users their freedom.  It seems improper to make the GPL restrict what "
+#| "name people can use for the system."
 msgid ""
 "The purpose of the GNU GPL is to protect the users' freedom from those who "
 "would make proprietary versions of free software.  While it is true that "
 "those who call the system &ldquo;Linux&rdquo; often do things that limit the "
-"users' freedom, such as bundling non-free software with the GNU/Linux system "
-"or even developing non-free software for such use, the mere act of calling "
+"users' freedom, such as bundling nonfree software with the GNU/Linux system "
+"or even developing nonfree software for such use, the mere act of calling "
 "the system &ldquo;Linux&rdquo; does not, in itself, deny users their "
 "freedom.  It seems improper to make the GPL restrict what name people can "
 "use for the system."
@@ -3224,7 +3373,7 @@
 "لينكس&ldquo; لا يحد (بذاته) حرية المستخدمين. م
ن غير الملائم جعل جي بي إل "
 "تقيد الاسم الذي يستطيع الناس اختياره 
للنظام."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you objected to the original BSD license's advertising requirement to "
 "give credit to the University of California, isn't it hypocritical to demand "
@@ -3235,7 +3384,7 @@
 "لجامعة كاليفورنيا في رخصة BSD الأصلية؟ <span 
class=\"anchor-reference-id\">"
 "(<a href=\"#BSDlicense\">#BSDlicense</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would be hypocritical to make the name GNU/Linux a license requirement, "
 "and we don't.  We only <em>ask</em> you to give us the credit we deserve."
@@ -3243,14 +3392,14 @@
 "جعل الاسم غنو/لينكس متطلب في الرخص نفاق 
ونحن لا نقوم به. نحن <em>نطلب</em> "
 "منك فحسب نسب النظام إلينا لأننا نستحق ذلك."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please note that there are at least <a href=\"/licenses/bsd.html\"> two "
 "different BSD licenses</a>.  For clarity's sake, please don't use the term "
 "&ldquo;BSD license&rdquo; without specifying which one."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you failed to put something in the GNU GPL to require people to call "
 "the system &ldquo;GNU&rdquo;, you deserve what happened; why are you "
@@ -3261,7 +3410,7 @@
 "تسمية النظام &rdquo;غنو&ldquo;، لماذا تتحسرون 
الآن؟ <span class=\"anchor-"
 "reference-id\">(<a href=\"#deserve\">#deserve</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The question presupposes a rather controversial general ethical premise: "
 "that if people do not force you to treat them fairly, you are entitled to "
@@ -3271,11 +3420,11 @@
 "يفترض السؤال فرضية مثيرة للجدل: أن الناس 
إن لم يجبروك على العدل في معاملتهم "
 "فإنك سوف تستغلهم كما تشاء. إنها تفترض صحة 
ذلك."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope you disagree with that premise just as we do."
 msgstr "نأمل أنك تختلف مع هذه الفرضية كما 
نختلف نحن معها."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't you be better off not contradicting what so many people believe? "
 "<span class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)"
@@ -3284,7 +3433,7 @@
 "أليس من الأفضل لكم ألا تعارضوا ما يعتقده 
كثير من الناس؟ <span class=\"anchor-"
 "reference-id\">(<a href=\"#contradict\">#contradict</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't think we should go along with large numbers of people because they "
 "have been misled.  We hope you too will decide that truth is important."
@@ -3292,7 +3441,7 @@
 "نحن لا نعتقد أن علينا أن نساير الناس 
الأكثر لأننا نعتقد أنهم قد خدعوا. نأمل "
 "منك أيضًا أن تعتبر الحقيقة غالية ومهمة."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We could never have developed a free operating system without first denying "
 "the belief, held by most people, that proprietary software was legitimate "
@@ -3301,7 +3450,7 @@
 "لم يكن بمقدرونا أبدًا أن نطور نظام تشغيل 
حر قبل أن ننكر الاعتقاد الذي يتبناه "
 "معظم الناس أن البرمجيات الاحتكارية مشروعة 
ومقبولة."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
 "<span class=\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</"
@@ -3311,18 +3460,18 @@
 "class=\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "We don't think that the popularity of an error makes it the truth."
 msgstr "نحن لا نعتقد أن الشهرة تجعل من الخطأ 
صوابًا."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it better to call the system by the name most users already know? "
 "<span class=\"anchor-reference-id\">(<a href=\"#knownname\">#knownname</a>)</"
 "span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo; includes "
 "&ldquo;Linux&rdquo;, they will recognize what you're talking about.  If you "
@@ -3330,7 +3479,7 @@
 "once in a while, they will all understand."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many people care about what's convenient or who's winning, not about "
 "arguments of right or wrong.  Couldn't you get more of their support by a "
@@ -3341,11 +3490,11 @@
 "خاطئ. ألم يكن بإمكاننا أن نستفيد منهم لو 
سلكوا طريقًا آخرًا؟ <span class="
 "\"anchor-reference-id\">(<a href=\"#winning\">#winning</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 # | To care only about what's convenient or who's winning is an amoral
-# | approach to life.  Non-free software is an example of that amoral approach
-# | and thrives on it.  Thus{+,+} in the long run it [-is-] {+would be+}
-# | self-defeating for us to [-bow to-] {+adopt+} that approach.  We will
+# | approach to life.  Non[---]free software is an example of that amoral
+# | approach and thrives on it.  Thus{+,+} in the long run it [-is-] {+would
+# | be+} self-defeating for us to [-bow to-] {+adopt+} that approach.  We will
 # | continue talking in terms of right and wrong.
 #, fuzzy
 #| msgid ""
@@ -3356,15 +3505,15 @@
 #| "right and wrong."
 msgid ""
 "To care only about what's convenient or who's winning is an amoral approach "
-"to life.  Non-free software is an example of that amoral approach and "
-"thrives on it.  Thus, in the long run it would be self-defeating for us to "
-"adopt that approach.  We will continue talking in terms of right and wrong."
+"to life.  Nonfree software is an example of that amoral approach and thrives "
+"on it.  Thus, in the long run it would be self-defeating for us to adopt "
+"that approach.  We will continue talking in terms of right and wrong."
 msgstr ""
 "أن تهتم بالأسهل أو بمن يفوز هو منهج فكري في 
الحياة. البرمجيات غير الحرة مثال "
 "على ما يؤديه ذلك المنهج وهي ناجحة في 
ثناياه؛ ولذا فإنه من المدمر لنا على "
 "المدى البعيد أن نسلك ذلك المنهج. سوف نواصل 
الحديث عما هو صحيح وخاطئ."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope that you are one of those for whom right and wrong do matter."
 msgstr "نأمل أنك من الذين يهتمون بما هو صحيح 
وخاطئ."
 
@@ -3419,14 +3568,14 @@
 "href=\"/server/standards/README.translations.html\">دليل الترجم
Ø©</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2001, [-2006, 2007, 2008-] {+2006-2008, 2010, 2011, 2013,
-# | 2014-2018, 2020, 2021+} Free Software Foundation, Inc.
+# | Copyright &copy; [-2001, 2006, 2007, 2008-] {+2001-2011, 2013-2018, 2020,
+# | 2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 2001, 2006, 2007, 2008 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation, "
+"Inc."
 msgstr ""
 "حقوق النشر:</p><p style=\"direction: ltr\">\n"
 "Copyright &copy; 2001, 2006, 2007, 2008 Free Software Foundation, Inc. "

Index: gnu/po/gnu-linux-faq.ca-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ca-diff.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- gnu/po/gnu-linux-faq.ca-diff.html   30 May 2021 19:03:08 -0000      1.22
+++ gnu/po/gnu-linux-faq.ca-diff.html   30 Aug 2021 13:34:52 -0000      1.23
@@ -10,35 +10,34 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.79</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.79</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;GNU/Linux FAQ
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/gnu/po/gnu-linux-faq.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;GNU/Linux FAQ 
by</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;GNU/Linux FAQ&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;GNU/Linux <span class="removed"><del><strong>FAQ 
by</strong></del></span> <span class="inserted"><ins><em>FAQ&lt;/h2&gt;
 
-&lt;address class="byline c"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;</strong></del></span> <span 
class="inserted"><ins><em>Stallman&lt;/address&gt;
+&lt;address class="byline"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;
 
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;To</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;To</em></ins></span> learn more about 
this issue, you can also read
+  &lt;blockquote&gt;&lt;p&gt;To learn more about this issue, you can also read
 our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
Project&lt;/a&gt;, our
  page on &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;
 and our page on &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU
-Users Who Have Never Heard of <span 
class="removed"><del><strong>GNU&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;</strong></del></span>
 <span class="inserted"><ins><em>GNU&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
-&lt;/div&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;
+Users Who Have Never Heard of GNU&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span> <span 
class="inserted"><ins><em>Stallman&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;
 When people see that we use and recommend the name GNU/Linux for a
 system that many others call just &ldquo;Linux&rdquo;, they ask many questions.
 Here are common questions, and our answers.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;div class="toc"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;h3 class="no-display"&gt;Table of Contents&lt;/h3&gt;</em></ins></span>
 &lt;ul&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#why" 
id="TOCwhy"&gt;Why</strong></del></span> <span 
class="inserted"><ins><em>href="#why"&gt;Why</em></ins></span> do you call 
<span class="removed"><del><strong>it</strong></del></span> <span 
class="inserted"><ins><em>the system we use</em></ins></span> GNU/Linux and not 
Linux?&lt;/a&gt;&lt;/li&gt;
@@ -299,7 +298,16 @@
     get more of their support by a different road?&lt;/a&gt;&lt;/li&gt;
 
 &lt;/ul&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;/div&gt;
+
+&lt;div class="announcement comment" role="complementary"&gt;
+&lt;p&gt;To learn more about this issue, you can also read
+our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
System&lt;/a&gt;, our
+ page on &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;
+and our page on &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU
+Users Who Have Never Heard of GNU&lt;/a&gt;.&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;</em></ins></span>
 
 &lt;dl&gt;
 
@@ -340,10 +348,13 @@
 
 &lt;dt <span class="inserted"><ins><em>id="what"&gt;What is the real 
relationship between GNU and Linux? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#what"&gt;#what&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
-&lt;dd&gt;The GNU operating system and the Linux kernel are separate
+&lt;dd&gt;
+&lt;p&gt;
+The GNU operating system and the Linux kernel are separate
 software projects that do complementary jobs.  Typically they are
 packaged in a &lt;a href="/distros/distros.html"&gt;GNU/Linux 
distribution&lt;/a&gt;, and used
-together.&lt;/dd&gt;
+together.&lt;/p&gt;
+&lt;/dd&gt;
 
 &lt;dt</em></ins></span> id="howerror"&gt;How did it come about that most
     people call the system &ldquo;Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#howerror"&gt;#howerror&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
@@ -456,11 +467,12 @@
           support an individual's free speech rights to call the system by
           any name that individual chooses? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#freespeech"&gt;#freespeech&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Yes, indeed, we believe you have a free speech right to call the
 operating system by any name you wish.  We ask that people call it
 GNU/Linux as a matter of doing justice to the GNU project, to promote
 the values of freedom that GNU stands for, and to inform others that
-those values of freedom brought the system into existence.
+those values of freedom brought the system into <span 
class="removed"><del><strong>existence.</strong></del></span> <span 
class="inserted"><ins><em>existence.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="everyoneknows"&gt;Since everyone knows
@@ -491,11 +503,12 @@
     why does it matter what name I use? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#everyoneknows2"&gt;#everyoneknows2&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 If your words don't reflect your knowledge, you don't teach others.
 Most people who have heard of the GNU/Linux system think it is
 &ldquo;Linux&rdquo;, that it was started by Linus Torvalds, and that
 it was intended to be &ldquo;open source&rdquo;.  If you don't tell
-them, who will?
+them, who <span class="removed"><del><strong>will?</strong></del></span> <span 
class="inserted"><ins><em>will?&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="windows"&gt;Isn't shortening &ldquo;GNU/Linux&rdquo;
@@ -602,19 +615,21 @@
 &lt;dt id="brain"&gt;Isn't the kernel the brain of the system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#brain"&gt;#brain&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 A computer system is not much like a human body,
 and no part of it plays a role comparable to that of
-the brain in a human.
+the brain in a <span class="removed"><del><strong>human.</strong></del></span> 
<span class="inserted"><ins><em>human.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="kernelmost"&gt;Isn't writing the kernel most of the work in an
 operating system? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#kernelmost"&gt;#kernelmost&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-No, many components take a lot of work.
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
+No, many components take a lot of <span 
class="removed"><del><strong>work.</strong></del></span> <span 
class="inserted"><ins><em>work.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="nokernel"&gt;An operating system 
requires a kernel.
+&lt;dt id="nokernel"&gt;An operating system requires a kernel.
     Since the GNU Project didn't develop a kernel, how can
     the system be GNU?&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#nokernel"&gt;#nokernel&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -633,10 +648,10 @@
 &lt;p&gt;
 Linus Torvalds made an important contribution to the operating system
 we use; the GNU Project started earlier and contributed much more.
-The name &ldquo;GNU/Linux&rdquo; gives credit to each.&lt;/p&gt;
+The name &ldquo;GNU/Linux&rdquo; gives credit to 
each.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="notinstallable"&gt;How can GNU be an
+&lt;dt id="notinstallable"&gt;How can GNU be an
     operating system, if I can't get something called &ldquo;GNU&rdquo;
     and install it? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#notinstallable"&gt;#notinstallable&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -697,11 +712,12 @@
     feel of Linux&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#feel"&gt;#feel&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 There is no such thing as the &ldquo;feel of Linux&rdquo; because
 Linux has no user interfaces.  Like any modern kernel, Linux is a base
 for running programs; user interfaces belong elsewhere in the system.
 Human interaction with GNU/Linux always goes through other programs,
-and the &ldquo;feel&rdquo; comes from them.
+and the &ldquo;feel&rdquo; comes from <span 
class="removed"><del><strong>them.</strong></del></span> <span 
class="inserted"><ins><em>them.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="long"&gt;The problem with &ldquo;GNU/Linux&rdquo; is that it is too 
long.
@@ -792,7 +808,8 @@
 may simply not recognize we're talking about the same system.  If we
 say &ldquo;GNU/Linux&rdquo;, they can make a connection to what they have heard
 about.&lt;/li&gt;
-&lt;/ul&gt;&lt;p&gt;&lt;/p&gt;
+<span 
class="removed"><del><strong>&lt;/ul&gt;&lt;p&gt;&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/ul&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="trademarkfee"&gt;I would have
@@ -846,11 +863,12 @@
     GNU/systemd/Linux? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#others"&gt;#others&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+&lt;p&gt;
 systemd is a fairly important component, but not as important as the
 kernel (Linux), nor as important as the basis of the system as a whole
 (GNU).  However, if you want to emphasize the presence of systemd
 by calling the system &ldquo;GNU/systemd/Linux&rdquo;, there is nothing
-wrong with doing so.
+wrong with doing so.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt</em></ins></span> id="others"&gt;Many other projects contributed to
@@ -922,8 +940,8 @@
 &lt;p&gt;
 We're not talking about a distinct GNU version of Linux, the kernel.
 The free GNU/Linux distros do have
-a &lt;a href="http://directory.fsf.org/project/linux"&gt;separate version of
-Linux&lt;/a&gt;, since the &ldquo;standard&rdquo; version contains non-free
+a &lt;a <span 
class="removed"><del><strong>href="http://directory.fsf.org/project/linux"&gt;separate</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://directory.fsf.org/wiki/Linux-libre"&gt;separate</em></ins></span>
 version of
+Linux&lt;/a&gt;, since the &ldquo;standard&rdquo; version contains <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
 firmware &ldquo;blobs&rdquo;.  If this were part of the GNU Project,
 it could be considered &ldquo;GNU Linux&rdquo;; but we would not want
 to call it that, because it would be too confusing.&lt;/p&gt;
@@ -1043,13 +1061,13 @@
     free software?  After all, that is the ideal of GNU. &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#reserve"&gt;#reserve&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-The widespread practice of adding non-free software to the GNU/Linux
+The widespread practice of adding <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software to the GNU/Linux
 system is a major problem for our community.  It teaches the users
-that non-free software is ok, and that using it is part of the spirit
+that <span class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software is ok, and that 
using it is part of the spirit
 of &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of 
their mission to
-help users use non-free add-ons, and may even invite salesmen to come
+help users use <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> add-ons, and may even 
invite salesmen to come
 and make sales pitches for them.  They adopt goals such as &ldquo;helping
-the users&rdquo; of GNU/Linux (including helping them use non-free
+the users&rdquo; of GNU/Linux (including helping them use <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
 applications and drivers), or making the system more popular even at
 the cost of freedom.
 &lt;p&gt;
@@ -1067,7 +1085,7 @@
 versions &lt;em&gt;are&lt;/em&gt; versions of GNU, that they all are based on a
 system that exists specifically for the sake of the users' freedom.
 With this understanding, they can start to recognize the distributions
-that include non-free software as perverted, adulterated versions of
+that include <span class="removed"><del><strong>non-free</strong></del></span> 
<span class="inserted"><ins><em>nonfree</em></ins></span> software as 
perverted, adulterated versions of
 GNU, instead of thinking they are proper and appropriate &ldquo;versions of
 Linux&rdquo;.&lt;/p&gt;
 &lt;p&gt;
@@ -1220,7 +1238,7 @@
 (there were already many of them, for various systems), but instead of
 calling it by a dull name like &ldquo;&lt;em&gt;somethingorother&lt;/em&gt; 
TECO&rdquo;, he
 thought of a clever amusing name.  (That's what hacking
-means: &lt;a href="http://stallman.org/articles/on-hacking.html"&gt;playful
+means: &lt;a <span 
class="removed"><del><strong>href="http://stallman.org/articles/on-hacking.html"&gt;playful</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://stallman.org/articles/on-hacking.html"&gt;playful</em></ins></span>
 cleverness&lt;/a&gt;.)&lt;/p&gt;
 &lt;p&gt;
 Other hackers enjoyed that name so much that we imitated the approach.
@@ -1246,7 +1264,7 @@
 We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems,
 because that term does not fit the history of the BSD systems.
 &lt;p&gt;
-The BSD system was developed by UC Berkeley as non-free software in
+The BSD system was developed by UC Berkeley as <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software in
 the 80s, and became free in the early 90s.  A free operating system
 that exists today is almost certainly either a variant of the GNU
 system, or a kind of BSD system.&lt;/p&gt;
@@ -1277,25 +1295,27 @@
 on Windows, does that mean I am running a GNU/Windows system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#othersys"&gt;#othersys&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of 
GNU
 are just a part of the GNU software, which is just a part of the GNU
 system, and underneath them you would still have another complete
 operating system which has no code in common with GNU.  All in all,
-that's a very different situation from GNU/Linux.
+that's a very different situation from <span 
class="removed"><del><strong>GNU/Linux.</strong></del></span> <span 
class="inserted"><ins><em>GNU/Linux.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="justlinux"&gt;Can't Linux be used without GNU? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#justlinux"&gt;#justlinux&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Linux is used by itself, or with small other programs, in some
 appliances.  These small software systems are a far cry from the
 GNU/Linux system.  Users do not install them on PCs, for instance, and
 would find them rather disappointing.  It is useful to say that these
 appliances run just Linux, to show how different those small platforms
-are from GNU/Linux.
+are from <span class="inserted"><ins><em>GNU/Linux.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="howmuch"&gt;How much of the GNU 
system is needed for the system
+&lt;dt id="howmuch"&gt;How much of the GNU system is needed for the system
 to be
 GNU/Linux? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#howmuch"&gt;#howmuch&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -1306,17 +1326,17 @@
 GNU is an operating system maintained by a community.  It includes far
 more than just the GNU software packages (of which we have a specific
 list), and people add more packages constantly.  Despite these
-changes, it remains the GNU system, and adding Linux to that yields
-GNU/Linux.  If you use part of the GNU system and omit part, there is
+changes, it remains the GNU system, and adding Linux to that 
yields</em></ins></span>
+GNU/Linux.  <span class="inserted"><ins><em>If you use part of the GNU system 
and omit part, there is
 no meaningful way to say &ldquo;how much&rdquo; you used.&lt;/p&gt;
 &lt;p&gt;
 If we look at the level of packages, Linux is one important package in
 the GNU/Linux system.  The inclusion of one important GNU package is
 enough to justify our request for equal mention.
-&lt;/p&gt;
+&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="linuxsyswithoutgnu"&gt;Are there complete Linux 
systems [sic] without GNU? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#linuxsyswithoutgnu"&gt;#linuxsyswithoutgnu&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+&lt;dt id="linuxsyswithoutgnu"&gt;Are there complete Linux systems [sic] 
without GNU? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#linuxsyswithoutgnu"&gt;#linuxsyswithoutgnu&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
 There are complete systems that contain Linux and not GNU; Android is
@@ -1396,10 +1416,11 @@
 &ldquo;Linux&rdquo; with that principle.
 &lt;p&gt;
 Linus publicly states his disagreement with the free software
-movement's ideals.  He developed non-free software in his job for many
+movement's ideals.  He developed <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software in his job for many
 years (and said so to a large audience at a &ldquo;Linux&rdquo;World show), and
 publicly invited fellow developers of Linux, the kernel, to use
-non-free software to work on it with him.  He goes even further, and
+<span class="removed"><del><strong>non-free</strong></del></span>
+<span class="inserted"><ins><em>nonfree</em></ins></span> software to work on 
it with him.  He goes even further, and
 rebukes people who suggest that engineers and scientists should
 consider social consequences of our technical work&mdash;rejecting the
 lessons society learned from the development of the atom bomb.&lt;/p&gt;
@@ -1418,11 +1439,13 @@
     work as GNU? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#claimlinux"&gt;#claimlinux&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 It would be wrong, so we don't do that.  Torvalds' work is Linux, the
 kernel; we are careful not to attribute that work to the GNU Project
 or label it as &ldquo;GNU&rdquo;.  When we talk about the whole
 system, the name &ldquo;GNU/Linux&rdquo; gives him a share of the
-credit.
+<span class="removed"><del><strong>credit.</strong></del></span>
+<span class="inserted"><ins><em>credit.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 
@@ -1432,7 +1455,8 @@
 &lt;dd&gt;
 &lt;p&gt;He recognized this at the beginning.  The earliest Linux release notes
 said, &lt;a
-href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+<span 
class="removed"><del><strong>href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
 &ldquo;Most of the tools used with linux are GNU software and are under the
 GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
 for more info&rdquo;&lt;/a&gt;.&lt;/p&gt;
@@ -1450,7 +1474,7 @@
 a big job, and it's not clearly necessary.  The only thing ethically
 wrong with Linux as a kernel is its inclusion of firmware
 &ldquo;blobs&rdquo;; the best fix for that problem
-is &lt;a href="http://fsf.org/campaigns/priority-projects"&gt; developing
+is &lt;a <span 
class="removed"><del><strong>href="http://fsf.org/campaigns/priority-projects"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.fsf.org/campaigns/priority-projects"&gt;</em></ins></span>
 developing
 free replacement for the blobs&lt;/a&gt;.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -1459,12 +1483,13 @@
     it? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#lost"&gt;#lost&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 This isn't a battle, it is a campaign of education.  What to call the
 system is not a single decision, to be made at one moment by
 &ldquo;society&rdquo;: each person, each organization, can decide what
 name to use.  You can't make others say &ldquo;GNU/Linux&rdquo;, but
 you can decide to call the system &ldquo;GNU/Linux&rdquo;
-yourself&mdash;and by doing so, you will help educate others.
+yourself&mdash;and by doing so, you will help educate <span 
class="removed"><del><strong>others.</strong></del></span> <span 
class="inserted"><ins><em>others.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="whatgood"&gt;Society has made its
@@ -1472,6 +1497,7 @@
     &ldquo;GNU/Linux&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#whatgood"&gt;#whatgood&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 This is not an all-or-nothing situation: correct and incorrect
 pictures are being spread more or less by various people.  If you call
 the system &ldquo;GNU/Linux&rdquo;, you will help others learn the system's 
true
@@ -1479,7 +1505,7 @@
 everywhere on your own, any more than we can, but you can help.  If
 only a few hundred people see you use the term &ldquo;GNU/Linux&rdquo;, you 
will
 have educated a substantial number of people with very little work.
-And some of them will spread the correction to others.
+And some of them will spread the correction to <span 
class="removed"><del><strong>others.</strong></del></span> <span 
class="inserted"><ins><em>others.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="explain"&gt;Wouldn't it be better to call
@@ -1550,39 +1576,44 @@
     is it legitimate to rename the operating system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#rename"&gt;#rename&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 We are not renaming anything; we have been calling this system 
&ldquo;GNU&rdquo;
 ever since we announced it in 1983.  The people who tried to rename
-it to &ldquo;Linux&rdquo; should not have done so.&lt;/dd&gt;
+it to &ldquo;Linux&rdquo; should not have done <span 
class="removed"><del><strong>so.&lt;/dd&gt;</strong></del></span> <span 
class="inserted"><ins><em>so.&lt;/p&gt;
+&lt;/dd&gt;</em></ins></span>
 
 &lt;dt id="force"&gt;Isn't it wrong to force people to call
 the system &ldquo;GNU/Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#force"&gt;#force&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 It would be wrong to force them, and we don't try.  We call the system
-&ldquo;GNU/Linux&rdquo;, and we ask you to do it too.
+&ldquo;GNU/Linux&rdquo;, and we ask you to do it <span 
class="removed"><del><strong>too.</strong></del></span> <span 
class="inserted"><ins><em>too.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="whynotsue"&gt;Why not sue people who call
 the whole system &ldquo;Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#whynotsue"&gt;#whynotsue&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 There are no legal grounds to sue them, but since we believe in
 freedom of speech, we wouldn't want to do that anyway.  We ask people
-to call the system &ldquo;GNU/Linux&rdquo; because that is the right thing to 
do.
+to call the system &ldquo;GNU/Linux&rdquo; because that is the right thing to 
<span class="removed"><del><strong>do.</strong></del></span> <span 
class="inserted"><ins><em>do.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="require"&gt;Shouldn't you put something in
     the GNU GPL to require people to call the system &ldquo;GNU&rdquo;? 
&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#require"&gt;#require&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 The purpose of the GNU GPL is to protect the users' freedom from those
 who would make proprietary versions of free software.  While it is
 true that those who call the system &ldquo;Linux&rdquo; often do things that 
limit
-the users' freedom, such as bundling non-free software with the
-GNU/Linux system or even developing non-free software for such use,
+the users' freedom, such as bundling <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software with the
+GNU/Linux system or even developing <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software for such use,
 the mere act of calling the system &ldquo;Linux&rdquo; does not, in itself, 
deny
 users their freedom.  It seems improper to make the GPL restrict what
-name people can use for the system.
+name people can use for the <span 
class="removed"><del><strong>system.</strong></del></span> <span 
class="inserted"><ins><em>system.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="BSDlicense"&gt;Since you objected to the original BSD license's
@@ -1630,17 +1661,19 @@
 it &ldquo;Linux&rdquo;, doesn't that make it right? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#somanyright"&gt;#somanyright&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-We don't think that the popularity of an error makes it the truth.
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
+We don't think that the popularity of an error makes it the <span 
class="removed"><del><strong>truth.</strong></del></span> <span 
class="inserted"><ins><em>truth.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="knownname"&gt;Isn't it better to call the
     system by the name most users already know? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#knownname"&gt;#knownname&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo;
 includes &ldquo;Linux&rdquo;, they will recognize what you're talking
 about.  If you add &ldquo;(often erroneously referred to as
-&lsquo;Linux&rsquo;)&rdquo; once in a while, they will all understand.
+&lsquo;Linux&rsquo;)&rdquo; once in a while, they will all <span 
class="removed"><del><strong>understand.</strong></del></span> <span 
class="inserted"><ins><em>understand.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="winning"&gt;Many people care about what's
@@ -1650,7 +1683,7 @@
 
 &lt;dd&gt;
 To care only about what's convenient or who's winning is an amoral
-approach to life.  Non-free software is an example of that amoral
+approach to life.  <span 
class="removed"><del><strong>Non-free</strong></del></span>  <span 
class="inserted"><ins><em>Nonfree</em></ins></span> software is an example of 
that amoral
 approach and thrives on it.  Thus, in the long run it would be
 self-defeating for us to adopt that approach.  We will continue
 talking in terms of right and wrong.
@@ -1659,8 +1692,7 @@
 &lt;/dd&gt;
 
 &lt;/dl&gt;
-<span class="inserted"><ins><em>&lt;/div&gt;
-&lt;/div&gt;</em></ins></span>
+<span class="inserted"><ins><em>&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;
@@ -1709,7 +1741,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2001, <span class="removed"><del><strong>2006, 2007, 
2008,</strong></del></span> <span 
class="inserted"><ins><em>2006-2008,</em></ins></span> 2010, 2011, 2013, <span 
class="removed"><del><strong>2014, 2015, 2016</strong></del></span> <span 
class="inserted"><ins><em>2014-2018, 2020, 2021</em></ins></span>
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>2001, 2006, 2007, 
2008, 2010, 2011, 2013, 2014, 2015, 2016</strong></del></span> <span 
class="inserted"><ins><em>2001-2011, 2013-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"
@@ -1720,7 +1752,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/30 19:03:08 $
+$Date: 2021/08/30 13:34:52 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: gnu/po/gnu-linux-faq.ca.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ca.po,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- gnu/po/gnu-linux-faq.ca.po  30 May 2021 19:03:08 -0000      1.96
+++ gnu/po/gnu-linux-faq.ca.po  30 Aug 2021 13:34:52 -0000      1.97
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnu-linux-faq\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2016-09-18 09:47+0200\n"
 "Last-Translator: Miquel Puigpelat <mpuigpe1@xtec.cat>\n"
 "Language-Team: Catalan <www-ca-traductors@gnu.org>\n"
@@ -23,33 +23,19 @@
 msgstr ""
 "Preguntes freqüents sobre GNU/Linux - Projecte GNU - Free Software 
Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU/Linux FAQ"
 msgstr ""
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 # || No change detected.  The change might only be in amounts of spaces.
 #, fuzzy
 #| msgid "by Richard Stallman"
 msgid "by Richard Stallman"
 msgstr "per Richard Stallman"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
-"linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a href=\"/"
-"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Per aprendre més sobre aquest tema, també podeu llegir la nostra pàgina "
-"sobre <a href=\"/gnu/linux-and-gnu.html\">Linux i el Projecte GNU</a>, la "
-"pàgina <a href=\"/gnu/why-gnu-linux.html\">Per què GNU/Linux?</a> i la "
-"pàgina <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">Usuaris del GNU "
-"que mai no han sentit parlar del GNU</a>."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When people see that we use and recommend the name GNU/Linux for a system "
 "that many others call just &ldquo;Linux&rdquo;, they ask many questions.  "
@@ -59,6 +45,13 @@
 "sistema al que molts denominen simplement «Linux», fan moltes preguntes. 
Ací "
 "estan les més comunes i les nostres respostes."
 
+#. type: Content of: <div><div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "Índex de continguts"
+
 #. type: Content of: <div><div><ul><li>
 # | <a href=\"#why\">Why do you call [-it-] {+the system we use+} GNU/Linux
 # | and not Linux?</a>
@@ -666,7 +659,34 @@
 "que està mal. No creieu que obtindríeu més suport de la seva part per un "
 "altre camí?</a>"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
+# | {+System</a>,+} our page on <a href=\"/gnu/why-gnu-linux.html\">Why
+# | GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our page on <a href=\"/"
+#| "gnu/linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a "
+#| "href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
+"linux-and-gnu.html\">Linux and the GNU System</a>, our page on <a href=\"/"
+"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Per aprendre més sobre aquest tema, també podeu llegir la nostra pàgina "
+"sobre <a href=\"/gnu/linux-and-gnu.html\">Linux i el Projecte GNU</a>, la "
+"pàgina <a href=\"/gnu/why-gnu-linux.html\">Per què GNU/Linux?</a> i la "
+"pàgina <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">Usuaris del GNU "
+"que mai no han sentit parlar del GNU</a>."
+
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you call the system we use GNU/Linux and not Linux? <span class="
 "\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>"
@@ -674,7 +694,7 @@
 "Per què l'anomeneu GNU/Linux i no Linux? <span 
class=\"anchor-reference-id\">"
 "(<a href=\"#why\">#why</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Most operating system distributions based on Linux as kernel are basically "
 "modified versions of the GNU operating system.  We began developing GNU in "
@@ -693,11 +713,11 @@
 "components centrals, que formen la major contribució al conjunt del sistema. 
"
 "La idea bàsica era nostra també."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "In fairness, we ought to get at least equal mention."
 msgstr "Per ser justos, deuríem tenir almenys igual reconeixement."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and the GNU System</a> and <a "
 "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
@@ -709,7 +729,7 @@
 "han sentit parlar del GNU</a> per més explicacions, i <a 
href=\"/gnu/the-gnu-"
 "project.html\">El Projecte GNU</a> per conèixer la història."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why is the name important? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
@@ -717,7 +737,7 @@
 "Per què és important el nom? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Although the developers of Linux, the kernel, are contributing to the free "
 "software community, many of them do not care about freedom.  People who "
@@ -732,7 +752,7 @@
 "la nostra comunitat que realment no han interpretat. Llavors aquesta gent "
 "dóna un pes desproporcionat al punt de vista dels desenvolupadors."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Calling the system GNU/Linux recognizes the role that our idealism played in "
 "building our community, and <a href=\"/gnu/why-gnu-linux.html\">helps the "
@@ -743,20 +763,20 @@
 "html\">ajuda al públic a reconèixer la importància pràctica d'aquests "
 "ideals</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the real relationship between GNU and Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#what\">#what</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU operating system and the Linux kernel are separate software projects "
 "that do complementary jobs.  Typically they are packaged in a <a href=\"/"
 "distros/distros.html\">GNU/Linux distribution</a>, and used together."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How did it come about that most people call the system &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
@@ -766,7 +786,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; is a confusion that has spread faster "
 "than the corrective information."
@@ -774,7 +794,7 @@
 "L'anomenar «Linux» al sistema és una confusió que s'ha difós més ràpid 
que "
 "la informació correcta."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who combined Linux with the GNU system were not aware that that's "
 "what their activity amounted to.  They focused their attention on the piece "
@@ -791,7 +811,7 @@
 "adonar-nos que el problema era aquest i demanar a la gent de corregir-lo. "
 "Per aquells temps, la confusió ja s'havia estès."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the people who call the system &ldquo;Linux&rdquo; have never heard "
 "why that's not the right thing.  They saw others using that name and assume "
@@ -809,7 +829,7 @@
 "desenvolupament començà amb Linus Torvalds el 1991. Aquesta falsa visió "
 "tendeix a reforçar la idea de què el sistema ha d'anomenar-se «Linux»."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Many of the questions in this file represent people's attempts to justify "
 "the name they are accustomed to using."
@@ -817,7 +837,7 @@
 "Moltes de les qüestions en aquest arxiu representen l'intent de la gent per "
 "justificar el nom que estan acostumats a utilitzar."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we always say &ldquo;GNU/Linux&rdquo; instead of &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
@@ -825,7 +845,7 @@
 "Hauríem de dir sempre «GNU/Linux» en lloc de «Linux»? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not always&mdash;only when you're talking about the whole system.  When "
 "you're referring specifically to the kernel, you should call it &ldquo;"
@@ -835,7 +855,7 @@
 "estigueu referint al nucli en especial, deuríeu d'anomenar-lo «Linux», el "
 "nom que elegí el seu desenvolupador."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
 "call the whole system by the same name as the kernel.  This causes many "
@@ -850,7 +870,7 @@
 "referint al nucli o al sistema complet. Anomenant «GNU/Linux» al sistema i "
 "«Linux» al nucli, evitareu aquesta ambigüitat."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Would Linux have achieved the same success if there had been no GNU? <span "
 "class=\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</"
@@ -859,7 +879,7 @@
 "Hauria aconseguit Linux el mateix èxit sense GNU? <span class=\"anchor-"
 "reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In that alternative world, there would be nothing today like the GNU/Linux "
 "system, and probably no free operating system at all.  No one attempted to "
@@ -873,7 +893,7 @@
 "CSRG, que havia començat a alliberar el codi per una petició del Projecte "
 "GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds was partly influenced by a speech about GNU in Finland in "
 "1990.  It's possible that even without this influence he might have written "
@@ -887,7 +907,7 @@
 "programari lliure. Linux fou lliure l'any 1992 quan Linus el publicà baix la 
"
 "llicència GNU GPL. (Veieu les notes de llançament de la versió 0.12.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Even if Torvalds had released Linux under some other free software license, "
 "a free kernel alone would not have made much difference to the world.  The "
@@ -899,7 +919,7 @@
 "significativa en el món. La importància de Linux vingué d'ajustar-lo en un 
"
 "marc més ampli, en un sistema operatiu completament lliure: el GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better for the community if you did not divide people with "
 "this request? <span class=\"anchor-reference-id\">(<a href=\"#divide"
@@ -909,7 +929,7 @@
 "petició? <span class=\"anchor-reference-id\">(<a href=\"#divide\">#divide</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
 "people.  We are asking them to give the GNU Project credit for the GNU "
@@ -919,7 +939,7 @@
 "demanant-los que donen la importància al Projecte GNU que es mereix pel "
 "sistema operatiu GNU. Això no critica o lleva mèrits a ningú."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, there are people who do not like our saying this.  Sometimes those "
 "people push us away in response.  On occasion they are so rude that one "
@@ -933,7 +953,7 @@
 "nos. Això no ens silencia, però tendeix a dividir la comunitat, així que "
 "tenim l'esperança que pugeu convèncer-los per aturar-se."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, this is only a secondary cause of division in our community.  The "
 "largest division in the community is between people who appreciate free "
@@ -950,7 +970,7 @@
 "el programari lliure sols com un alternativa eficient de model de "
 "desenvolupament (el moviment del codi obert)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This disagreement is not just a matter of names&mdash;it is a matter of "
 "differing basic values.  It is essential for the community to see and think "
@@ -966,7 +986,7 @@
 "misses-the-point.html\">Per què el programari lliure és millor que el de "
 "codi obert</a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The disagreement over values partially aligns with the amount of attention "
 "people pay to the GNU Project's role in our community.  People who value "
@@ -991,7 +1011,7 @@
 "llibertat persuadim a tothom (cosa que no serà gens fàcil), o siguem "
 "derrotats definitivament (espero que no)."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Doesn't the GNU project support an individual's free speech rights to call "
 "the system by any name that individual chooses? <span class=\"anchor-"
@@ -1001,7 +1021,7 @@
 "anomenar al sistema com cadascú trii? <span class=\"anchor-reference-id\">"
 "(<a href=\"#freespeech\">#freespeech</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Yes, indeed, we believe you have a free speech right to call the operating "
 "system by any name you wish.  We ask that people call it GNU/Linux as a "
@@ -1015,7 +1035,7 @@
 "els valors de la llibertat en els que es basa el GNU i per informar a altres "
 "que aquests valors els que han fet possible l'existència del sistema."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since everyone knows the role of GNU in developing the system, doesn't the "
 "&ldquo;GNU/&rdquo; in the name go without saying? <span class=\"anchor-"
@@ -1025,7 +1045,7 @@
 "se sobreentén «GNU/» sense dir-ho? <span class=\"anchor-reference-id\">(<a 
"
 "href=\"#everyoneknows\">#everyoneknows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Experience shows that the system's users, and the computer-using public in "
 "general, often know nothing about the GNU system.  Most articles about the "
@@ -1040,7 +1060,7 @@
 "html\">Usuaris del GNU que mai no han sentit parlar del GNU</a> ho explica "
 "amb més detall."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who say this are probably geeks thinking of the geeks they know.  "
 "Geeks often do know about GNU, but many have a completely wrong idea of what "
@@ -1053,7 +1073,7 @@
 "Per exemple, molts creuen que és una col·lecció de «<a href=\"#tools"
 "\">ferramentes</a>», o un projecte per desenvolupar ferramentes."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The wording of this question, which is typical, illustrates another common "
 "misconception.  To speak of &ldquo;GNU's role&rdquo; in developing something "
@@ -1067,7 +1087,7 @@
 "parlar sobre el paper del Projecte GNU en aquesta o alguna altra activitat, "
 "però no el del GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since I know the role of GNU in this system, why does it matter what name I "
 "use? <span class=\"anchor-reference-id\">(<a href="
@@ -1077,7 +1097,7 @@
 "utilitzi? <span class=\"anchor-reference-id\">(<a href="
 "\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your words don't reflect your knowledge, you don't teach others.  Most "
 "people who have heard of the GNU/Linux system think it is &ldquo;"
@@ -1090,7 +1110,7 @@
 "que tenia la intenció de ser «codi obert». Si no els conta la veritat, qui 
"
 "ho farà?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't shortening &ldquo;GNU/Linux&rdquo; to &ldquo;Linux&rdquo; just like "
 "shortening &ldquo;Microsoft Windows&rdquo; to &ldquo;Windows&rdquo;? <span "
@@ -1100,7 +1120,7 @@
 "per referir-nos al «Microsoft Windows»? <span 
class=\"anchor-reference-id\">"
 "(<a href=\"#windows\">#windows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It's useful to shorten a frequently-used name, but not if the abbreviation "
 "is misleading."
@@ -1108,7 +1128,7 @@
 "És útil escurçar un nom que s'utilitza molt, però no si l'abreviatura és 
"
 "enganyosa."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Almost everyone in developed countries really does know that the &ldquo;"
 "Windows&rdquo; system is made by Microsoft, so shortening &ldquo;Microsoft "
@@ -1122,7 +1142,7 @@
 "i l'origen del sistema. Escurçar «GNU/Linux» a «Linux» dóna una idea "
 "equivocada d'on prové el sistema."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The question is itself misleading because GNU and Microsoft are not the same "
 "kind of thing.  Microsoft is a company; GNU is an operating system."
@@ -1130,7 +1150,7 @@
 "La qüestió és en sí enganyosa perquè GNU i Microsoft no són la mateixa 
cosa. "
 "Microsoft és una empresa; GNU és un sistema operatiu."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't GNU a collection of programming tools that were included in Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
@@ -1139,7 +1159,7 @@
 "el Linux? <span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "People who think that Linux is an entire operating system, if they hear "
 "about GNU at all, often get a wrong idea of what GNU is.  They may think "
@@ -1157,7 +1177,7 @@
 "operatiu és difícil d'introduir en un marc conceptual en el que el sistema "
 "operatiu és anomenat «Linux»."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Project was named after the GNU operating system&mdash;it's the "
 "project to develop the GNU system.  (See <a href=\"/gnu/initial-announcement."
@@ -1167,7 +1187,7 @@
 "per a desenvolupar el sistema GNU. (Veieu <a href=\"/gnu/initial-"
 "announcement.html\">l'anunci inicial de 1983</a>.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We developed programs such as GCC, GNU Emacs, GAS, GLIBC, BASH, etc., "
 "because we needed them for the GNU operating system.  GCC, the GNU Compiler "
@@ -1182,7 +1202,7 @@
 "treballàvem en el Projecte GNU, el Ghostscript, el GNUCash, el GNU Chess i "
 "el GNOME per al sistema GNU també."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the difference between an operating system and a kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
@@ -1190,7 +1210,7 @@
 "Quina és la diferència entre un sistema operatiu i un nucli? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "An operating system, as we use the term, means a collection of programs that "
 "are sufficient to use the computer to do a wide variety of jobs.  A general "
@@ -1203,7 +1223,7 @@
 "ser complet, deuria poder ocupar-se de totes les tasques que la gran majoria "
 "d'usuaris volguessin fer."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The kernel is one of the programs in an operating system&mdash;the program "
 "that allocates the machine's resources to the other programs that are "
@@ -1214,7 +1234,7 @@
 "executant. El nucli també ha d'encarregar-se d'arracar i aturar els altres "
 "programes."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "To confuse matters, some people use the term &ldquo;operating system&rdquo; "
 "to mean &ldquo;kernel&rdquo;.  Both uses of the term go back many years.  "
@@ -1234,7 +1254,7 @@
 "videojocs. Des que intentàrem que el GNU fos un sistema operatiu semblant a "
 "l'Unix, empràrem el terme «sistema operatiu» de la mateixa manera."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the time when people speak of the &ldquo;Linux operating "
 "system&rdquo; they are using &ldquo;operating system&rdquo; in the same "
@@ -1251,7 +1271,7 @@
 "únicament al nucli, llavors «Linux» és el nom correcte, però per favor 
dieu "
 "«nucli» també per evitar l'ambigüitat sobre el programari al que us 
referiu."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
@@ -1263,7 +1283,7 @@
 "correcte. Llavors també deuríeu parlar de distribucions del sistema GNU/"
 "Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The kernel of a system is like the foundation of a house.  How can a house "
 "be almost complete when it doesn't have a foundation? <span class=\"anchor-"
@@ -1273,7 +1293,7 @@
 "gairebé enllestida una casa si no té fonaments? <span class=\"anchor-"
 "reference-id\">(<a href=\"#house\">#house</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "A kernel is not much like the foundation of a house because building an "
 "operating system is not much like building a house."
@@ -1281,7 +1301,7 @@
 "Un nucli no és como els fonaments d'una casa, perquè construir un sistema "
 "operatiu no és com construir una casa."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A house is built from lots of little general parts that are cut and put "
 "together in situ.  They have to be put together from the bottom up.  Thus, "
@@ -1293,7 +1313,7 @@
 "tant, mentre no s'han fet els fonaments, no s'ha construït cap part "
 "essencial de la casa; tot el que tenim és un forat a terra."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "By contrast, an operating system consists of complex components that can be "
 "developed in any order.  When you have developed most of the components, "
@@ -1310,7 +1330,7 @@
 "acoblats i en òrbita a l'espera d'algun mòdul vital, l'Estació 
s'assemblaria "
 "al sistema GNU de 1992."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't the kernel the brain of the system? <span class=\"anchor-reference-id"
 "\">(<a href=\"#brain\">#brain</a>)</span>"
@@ -1318,7 +1338,7 @@
 "No és el nucli el cervell del sistema? <span class=\"anchor-reference-id\">"
 "(<a href=\"#brain\">#brain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A computer system is not much like a human body, and no part of it plays a "
 "role comparable to that of the brain in a human."
@@ -1326,7 +1346,7 @@
 "Un ordinador no s'assembla massa al cos humà, i cap de les seves parts té 
un "
 "paper comparable al del cervell en l'ésser humà."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't writing the kernel most of the work in an operating system? <span "
 "class=\"anchor-reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</"
@@ -1336,11 +1356,11 @@
 "operatiu? <span class=\"anchor-reference-id\">(<a href=\"#kernelmost"
 "\">#kernelmost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "No, many components take a lot of work."
 msgstr "No, molts components donen un munt de feina."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Isn't writing-]{+An operating system requires a kernel.  Since+} the
 # | [-kernel most of-] {+GNU Project didn't develop a kernel, how can+} the
 # | [-work in an operating system? <span-] {+system be GNU?<span+}
@@ -1361,7 +1381,7 @@
 "operatiu? <span class=\"anchor-reference-id\">(<a href=\"#kernelmost"
 "\">#kernelmost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The people who argue that way for calling the system &ldquo;Linux&rdquo; are "
 "using a double standard.  An operating system requires compilers, editors, "
@@ -1370,20 +1390,20 @@
 "any of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "That standard is too strict, not the right way to judge the contributions of "
 "any contributor."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds made an important contribution to the operating system we "
 "use; the GNU Project started earlier and contributed much more.  The name "
 "&ldquo;GNU/Linux&rdquo; gives credit to each."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How can GNU be an operating system, if I can't get something called &ldquo;"
 "GNU&rdquo; and install it? <span class=\"anchor-reference-id\">(<a href="
@@ -1393,7 +1413,7 @@
 "«GNU» i instal·lar-ho? <span class=\"anchor-reference-id\">(<a href="
 "\"#notinstallable\">#notinstallable</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Many <a href=\"/distros/distros.html\"> packaged and installable versions of "
 "GNU</a> are available.  None of them is called simply &ldquo;GNU&rdquo;, but "
@@ -1403,7 +1423,7 @@
 "instal·lables de GNU</a>.  Cap d'elles s'anomena només «GNU», però "
 "bàsicament són GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We expected to release the GNU system packaged for installation, but this "
 "plan was overtaken by events: in 1992 others were already packaging GNU "
@@ -1423,7 +1443,7 @@
 "l'anomenés només «GNU» perquè aquest havia de ser el nom d'una versió 
amb el "
 "nucli GNU Hurd &mdash;que encara no estava enllestit."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Hurd kernel never became sufficiently ready; we only recommend it to "
 "those interested in working on it.  So we never packaged GNU with the GNU "
@@ -1434,7 +1454,7 @@
 "distribuir GNU amb el nucli GNU Hurd. No obstant, Debian va distribuir "
 "aquesta combinació com a Debian GNU/Hurd."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are now developing an advanced Scheme-based package manager called Guix "
 "and a complete system distribution based on it called the <a href=\"/"
@@ -1446,7 +1466,7 @@
 "\"/software/guix\">Guix System Distribution</a> o GuixSF. Aquesta feina "
 "inclou reorganitzar una part substancial del sistema GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We never took the last step of packaging GNU under the name &ldquo;"
 "GNU&rdquo;, but that doesn't alter what kind of thing GNU is.  GNU is an "
@@ -1455,7 +1475,7 @@
 "Mai vam arribar a l'últim pas de distribuir GNU amb el nom «GNU», però 
això "
 "no altera quina mena de cosa és GNU. GNU és un sistema operatiu."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "We're calling the whole system after the kernel, Linux.  Isn't it normal to "
 "name an operating system after a kernel? <span class=\"anchor-reference-id\">"
@@ -1465,7 +1485,7 @@
 "normal anomenar al sistema operatiu com al seu nucli? <span class=\"anchor-"
 "reference-id\">(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "That practice seems to be very rare&mdash;we can't find any examples other "
 "than the misuse of the name &ldquo;Linux&rdquo;.  Normally an operating "
@@ -1480,7 +1500,7 @@
 "al sistema en conjunt. El nucli no sol tenir un nom propi—en lloc d'això, 
la "
 "gent diu «el nucli del susdit» o «el susdit nucli»."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Because those two constructions are used synonymously, the expression &ldquo;"
 "the Linux kernel&rdquo; can easily be misunderstood as meaning &ldquo;the "
@@ -1494,7 +1514,7 @@
 "aquesta mala interpretació dient o escrivint «el nucli, Linux» o «Linux, 
el "
 "nucli»."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can another system have &ldquo;the feel of Linux&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
@@ -1502,7 +1522,7 @@
 "Pot un altre sistema tenir «l'aspecte de Linux»? <span class=\"anchor-"
 "reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is no such thing as the &ldquo;feel of Linux&rdquo; because Linux has "
 "no user interfaces.  Like any modern kernel, Linux is a base for running "
@@ -1515,7 +1535,7 @@
 "executar programes; lesinterfícies d'usuari pertanyen a altres parts del "
 "sistema, i d'elles prové «l'aspecte»."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  How about "
 "recommending a shorter name? <span class=\"anchor-reference-id\">(<a href="
@@ -1525,7 +1545,7 @@
 "recomaneu? <span class=\"anchor-reference-id\">(<a href=\"#long\">#long</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "For a while we tried the name &ldquo;LiGNUx&rdquo;, which combines the words "
 "&ldquo;GNU&rdquo; and &ldquo;Linux&rdquo;.  The reaction was very bad.  "
@@ -1535,7 +1555,7 @@
 "i «Linux». La reacció fou molt dolenta. La genta accepta molt millor el 
nom "
 "«GNU/Linux»."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
 "call it &ldquo;GNU/Linux&rdquo; <a href=\"#justgnu\"> for the reasons given "
@@ -1544,7 +1564,7 @@
 "El nom legítim més curt per al sistema és «GNU», però l'anomenem 
«GNU/Linux» "
 "<a href=\"#justgnu\">per les raons que donem més avall</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How about calling the system &ldquo;GliNUx&rdquo; (instead of &ldquo;GNU/"
 "Linux&rdquo;)? <span class=\"anchor-reference-id\">(<a href="
@@ -1553,7 +1573,7 @@
 "És correcte anomenar el sistema «GliNUx» (en lloc de «GNU/Linux»)? <span 
"
 "class=\"anchor-reference-id\">(<a href=\"#long1\">#long1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The name &ldquo;GNU&rdquo; does not visibly appear in &ldquo;Glinux,&rdquo; "
 "so most people would not notice it is there.  Even if it is capitalized as "
@@ -1565,7 +1585,7 @@
 "(«GliNUx»), la major part de la gent no s'adonaria que aquesta lletra 
conté "
 "una referència a GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be comparable to writing &ldquo;GNU/Linux,&rdquo; but putting "
 "&ldquo;GNU/&rdquo; in print so small that most people could not read it."
@@ -1573,7 +1593,7 @@
 "Seria comparable a escriure «GNU/Linux», posant «GNU/» en lletra tant 
petita "
 "que la majoria de la gent no pogués llegir-ho."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  Why should "
 "I go to the trouble of saying &ldquo;GNU/&rdquo;? <span class=\"anchor-"
@@ -1583,7 +1603,7 @@
 "dient «GNU/»? <span class=\"anchor-reference-id\">(<a href="
 "\"#long2\">#long2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
 "the system that we developed, can't you take one second to recognize our "
@@ -1592,7 +1612,7 @@
 "Només pren un segon dir o teclejar «GNU/».  Si aprecieu el sistema que và
rem "
 "desenvolupar, no podeu gastar un segon en reconèixer la nostra feina?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Unfortunately, &ldquo;GNU/Linux&rdquo; is five syllables. People won't use "
 "such a long term. Shouldn't you find a shorter one? <span class=\"anchor-"
@@ -1602,7 +1622,7 @@
 "tan llarg. No n'hauríeu de trobar un de més curt? <span class=\"anchor-"
 "reference-id\">(<a href=\"#long3\">#long3</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, &ldquo;GNU/Linux&rdquo; is only four syllables.  &ldquo;"
 "Unfortunately&rdquo; is five syllables, yet people show no sign of "
@@ -1612,7 +1632,7 @@
 "cinc síl·labes, i així i tot la gent no sembla refractària a utilitzar "
 "aquesta paraula."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-How about calling-]{+Stallman doesn't ask us to call him &ldquo;Richard
 # | Matthew Stallman&rdquo; every+} the [-system &ldquo;GliNUx&rdquo; (instead
 # | of &ldquo;GNU/Linux&rdquo;)?-] {+time.  So why ask us to say
@@ -1632,21 +1652,21 @@
 "És correcte anomenar el sistema «GliNUx» (en lloc de «GNU/Linux»)? <span 
"
 "class=\"anchor-reference-id\">(<a href=\"#long1\">#long1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Omitting &ldquo;Matthew&rdquo; does not misrepresent anything important "
 "about Stallman's nature, origin, ideas or purpose.  Omitting &ldquo;"
 "GNU&rdquo; does misrepresent those things about the GNU/Linux system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is an example of a frequent way of hiding a fallacy: to bury it inside "
 "a misleading analogy.  A better analogy would be, &ldquo;Why shouldn't we "
 "call Stallman &lsquo;Torvalds&rsquo;?&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since Linux is a secondary contribution, would it be false to the facts to "
 "call the system simply &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id"
@@ -1656,7 +1676,7 @@
 "anomenar al sistema simplement «GNU»? <span class=\"anchor-reference-id\">"
 "(<a href=\"#justgnu\">#justgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would not be false to the facts, but it is not the best thing to do.  "
 "Here are the reasons we call that system version &ldquo;GNU/Linux&rdquo; "
@@ -1665,7 +1685,7 @@
 "No seria faltar als fets, però no és la millor opció. Ací estan les raons 
"
 "per les que anomenem «GNU/Linux» al sistema en lloc de «GNU» solament:"
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It's not exactly GNU&mdash;it has a different kernel (that is, Linux).  "
 "Distinguishing GNU/Linux from GNU is useful."
@@ -1673,7 +1693,7 @@
 "El sistema no és el GNU exactament—té un nucli diferent (el Linux). "
 "Diferenciant el GNU/Linux del GNU és útil."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It would be ungentlemanly to ask people to <em>stop</em> giving any credit "
 "to Linus Torvalds.  He did write an important component of the system.  We "
@@ -1693,7 +1713,7 @@
 "honorable i oberta, en lloc d'intentar arrabassar-li el reconeixement per la "
 "seva contribució al sistema."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
 "&ldquo;GNU&rdquo; they may simply not recognize we're talking about the same "
@@ -1705,7 +1725,7 @@
 "sistema. Si diem «GNU/Linux», poden fer una connexió amb el que ja han "
 "sentit."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "I would have to pay a fee if I use &ldquo;Linux&rdquo; in the name of a "
 "product, and that would also apply if I say &ldquo;GNU/Linux&rdquo;.  Is it "
@@ -1718,7 +1738,7 @@
 "«GNU» sense «Linux», per estalviar el canon? <span 
class=\"anchor-reference-"
 "id\">(<a href=\"#trademarkfee\">#trademarkfee</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There's nothing wrong in calling the system &ldquo;GNU&rdquo;; basically, "
 "that's what it is.  It is nice to give Linus Torvalds a share of the credit "
@@ -1728,7 +1748,7 @@
 "que és. És bo donar-li a Linus Torvalds el reconeixement que es mereix, 
però "
 "no teniu l'obligació de pagar pel privilegi de donar-se'l."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "So if you want to refer to the system simply as &ldquo;GNU&rdquo;, to avoid "
 "paying the fee for calling it &ldquo;Linux&rdquo;, we won't criticize you."
@@ -1736,7 +1756,7 @@
 "Així que si us voleu referir al sistema simplement com «GNU», per evitar "
 "pagar un canon per anomenar-lo «Linux», no us criticarem."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today; it includes "
 "TeX, X11, Apache, Perl, and many more programs.  Don't your arguments imply "
@@ -1750,7 +1770,7 @@
 "(Però això significaria un nom tant llarg que seria absurd.) <span class="
 "\"anchor-reference-id\">(<a href=\"#many\">#many</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "What we say is that you ought to give the system's principal developer a "
 "share of the credit.  The principal developer is the GNU Project, and the "
@@ -1760,7 +1780,7 @@
 "seva part de reconeixement. El principal desenvolupador és el Projecte GNU, "
 "i el sistema és bàsicament el GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you feel even more strongly about giving credit where it is due, you "
 "might feel that some secondary contributors also deserve credit in the "
@@ -1777,7 +1797,7 @@
 "fes-ho. Si penses que Perl simplement hauria de figurar, i vols escriure GNU/"
 "Linux/Perl, endavant."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Since a long name such as GNU/X11/Apache/Linux/TeX/Perl/Python/FreeCiv "
 "becomes absurd, at some point you will have to set a threshold and omit the "
@@ -1790,7 +1810,7 @@
 "desenvolupadors secundaris. No hi ha cap indicació òbvia d'on fixar el punt 
"
 "de tall, per tant no direm res en contra de la teva elecció."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Different threshold levels would lead to different choices of name for the "
 "system.  But one name that cannot result from concerns of fairness and "
@@ -1804,7 +1824,7 @@
 "reconeixement a una contribució secundària (Linux) mentre s'omet la "
 "contribució principal (GNU)."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Many companies contributed to-]{+systemd plays an important role in+}
 # | the {+GNU/Linux+} system as it is today; [-doesn't that mean-] {+are+} we
 # | [-ought-] {+obligated+} to call it [-GNU/Red&nbsp;Hat/Novell/Linux?-]
@@ -1827,7 +1847,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#manycompanies"
 "\">#manycompanies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "systemd is a fairly important component, but not as important as the kernel "
 "(Linux), nor as important as the basis of the system as a whole (GNU).  "
@@ -1835,7 +1855,7 @@
 "system &ldquo;GNU/systemd/Linux&rdquo;, there is nothing wrong with doing so."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today, but they don't "
 "insist on calling it XYZ/Linux.  Why should we treat GNU specially? <span "
@@ -1846,7 +1866,7 @@
 "especial? <span class=\"anchor-reference-id\">(<a href=\"#others\">#others</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Thousands of projects have developed programs commonly included in today's "
 "GNU/Linux systems.  They all deserve credit for their contributions, but "
@@ -1858,7 +1878,7 @@
 "contribucions, però no són els desenvolupadors principals del sistema "
 "complet, així que no demanen ser reconeguts d'aquesta forma."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is different because it is more than just a contributed program, more "
 "than just a collection of contributed programs.  GNU is the framework on "
@@ -1868,7 +1888,7 @@
 "més que una simple col·lecció de programes contribuents. El GNU és el 
marc "
 "on s'ha construït el sistema."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "GNU is a small fraction of the system nowadays, so why should we mention it? "
 "<span class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</"
@@ -1878,7 +1898,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In 2008, we found that GNU packages made up 15% of the &ldquo;main&rdquo; "
 "repository of the gNewSense GNU/Linux distribution.  Linux made up 1.5%.  So "
@@ -1889,7 +1909,7 @@
 "distribuició gNewSense GNU/Linux eren paquets GNU. Linux representava "
 "l'1,5%. De manera que el mateix argument serviria per no anomenar-lo 
«Linux»."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is a small fraction of the system nowadays, and Linux is an even smaller "
 "fraction.  But they are the system's core; the system was made by combining "
@@ -1899,7 +1919,7 @@
 "són el cor del sistema; el sistema es va fer combinant-los. Per això, el 
nom "
 "«GNU/Linux» continua sent adient."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many companies contributed to the system as it is today; doesn't that mean "
 "we ought to call it GNU/Red&nbsp;Hat/Novell/Linux? <span class=\"anchor-"
@@ -1910,7 +1930,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#manycompanies"
 "\">#manycompanies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is not comparable to Red Hat or Novell; it is not a company, or an "
 "organization, or even an activity.  GNU is an operating system.  (When we "
@@ -1924,7 +1944,7 @@
 "el sistema GNU.) El sistema GNU/Linux està basat en el GNU, i és per això "
 "que GNU deu apareixer en el nom."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Much of those companies' contribution to the GNU/Linux system lies in the "
 "code they have contributed to various GNU packages including GCC and GNOME.  "
@@ -1936,7 +1956,7 @@
 "incloent el GCC i el GNOME. Al dir GNU/Linux estem donant el reconeixement a "
 "aquestes empreses al igual que a la resta de desenvolupadors del GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
@@ -1945,7 +1965,7 @@
 "Per què escriviu «GNU/Linux» en lloc de «GNU Linux»? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean "
@@ -1957,7 +1977,7 @@
 "«Linux, que és un paquet del GNU.» Cap d'aquests significats s'ajusta a la 
"
 "situació real."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is not a GNU package; that is, it wasn't developed under the GNU "
 "Project's aegis or contributed specifically to the GNU Project.  Linus "
@@ -1970,14 +1990,32 @@
 "Així que el significat que s'extreu de «Linux, que és un paquet del GNU» 
no "
 "és cert."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | We're not talking about a distinct GNU version of Linux, the kernel.  The
+# | free GNU/Linux distros do have a <a
+# | [-href=\"http://directory.fsf.org/project/linux\";>separate-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>separate+} version
+# | of Linux</a>, since the &ldquo;standard&rdquo; version contains
+# | non[---]free firmware &ldquo;blobs&rdquo;.  If this were part of the GNU
+# | Project, it could be considered &ldquo;GNU Linux&rdquo;; but we would not
+# | want to call it that, because it would be too confusing.
+#, fuzzy
+#| msgid ""
+#| "We're not talking about a distinct GNU version of Linux, the kernel.  The "
+#| "free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/";
+#| "project/linux\">separate version of Linux</a>, since the &ldquo;"
+#| "standard&rdquo; version contains non-free firmware &ldquo;blobs&rdquo;.  "
+#| "If this were part of the GNU Project, it could be considered &ldquo;GNU "
+#| "Linux&rdquo;; but we would not want to call it that, because it would be "
+#| "too confusing."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
-"free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/project/";
-"linux\">separate version of Linux</a>, since the &ldquo;standard&rdquo; "
-"version contains non-free firmware &ldquo;blobs&rdquo;.  If this were part "
-"of the GNU Project, it could be considered &ldquo;GNU Linux&rdquo;; but we "
-"would not want to call it that, because it would be too confusing."
+"free GNU/Linux distros do have a <a href=\"https://directory.fsf.org/wiki/";
+"Linux-libre\">separate version of Linux</a>, since the &ldquo;"
+"standard&rdquo; version contains nonfree firmware &ldquo;blobs&rdquo;.  If "
+"this were part of the GNU Project, it could be considered &ldquo;GNU "
+"Linux&rdquo;; but we would not want to call it that, because it would be too "
+"confusing."
 msgstr ""
 "No parlem d'una versió GNU del Linux, el nucli. Les distribucions lliures "
 "GNU/Linux tenen una <a href=\"http://directory.fsf.org/project/linux";
@@ -1985,7 +2023,7 @@
 "no lliure. Si formés part del Projecte GNU, podria considerar-se «GNU "
 "Linux», però no volem anomenar-lo així perquè crearia confusió."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We're talking about a version of GNU, the operating system, distinguished by "
 "having Linux as the kernel.  A slash fits the situation because it means "
@@ -1998,7 +2036,7 @@
 "Sortida».) Aquest sistema és la combinació del GNU i el Linux; d'ací, 
«GNU/"
 "Linux»."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are other ways to express &ldquo;combination&rdquo;.  If you think "
 "that a plus-sign is clearer, please use that.  In French, a hyphen is clear: "
@@ -2009,7 +2047,7 @@
 "la suma (+) és clar, si us plau utilitzeu-lo. En francès, un guió és "
 "clarificador: «GNU-Linux». En castellà, de vegades diem «GNU con Linux»."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Should we say &ldquo;GNU/BSD&rdquo; too?-]{+How is the name
 # | &ldquo;GNU/Linux&rdquo; pronounced?+} <span
 # | class=\"anchor-reference-id\">(<a [-href=\"#bsd\">#bsd</a>)</span>-]
@@ -2025,14 +2063,14 @@
 "Deuríem dir «GNU/BSD» també? <span class=\"anchor-reference-id\">(<a 
href="
 "\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please pronounce it as &ldquo;GNU slash Linux.&rdquo; If you don't pronounce "
 "the slash, people will think you are saying &ldquo;GNU Linux,&rdquo; which "
 "is <a href=\"#whyslash\">not a suitable name for the combination</a>."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | Why do you write [-&ldquo;GNU/Linux&rdquo; instead of-] &ldquo;GNU
 # | [-Linux&rdquo;?-] {+Emacs&rdquo; rather than &ldquo;GNU/Emacs&rdquo;?+}
 # | <span class=\"anchor-reference-id\">(<a
@@ -2051,7 +2089,7 @@
 "Per què escriviu «GNU/Linux» en lloc de «GNU Linux»? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 # | Following the rules of English, in the construction &ldquo;GNU
 # | [-Linux&rdquo;-] {+Emacs&rdquo;+} the word &ldquo;GNU&rdquo; modifies
 # | [-&ldquo;Linux&rdquo;.  This can mean either &ldquo;GNU's version of
@@ -2075,14 +2113,14 @@
 "«Linux, que és un paquet del GNU.» Cap d'aquests significats s'ajusta a la 
"
 "situació real."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;GNU/Emacs&rdquo; would mean the combination of GNU, the operating "
 "system, and the program Emacs.  That doesn't fit this program, so &ldquo;GNU/"
 "Emacs&rdquo; is the wrong way to refer to it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why &ldquo;GNU/Linux&rdquo; rather than &ldquo;Linux/GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
@@ -2090,7 +2128,7 @@
 "Per què «GNU/Linux» en lloc de «Linux/GNU»? <span 
class=\"anchor-reference-id"
 "\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is right and proper to mention the principal contribution first.  The GNU "
 "contribution to the system is not only bigger than Linux and prior to Linux, "
@@ -2100,13 +2138,13 @@
 "del Projecte GNU al sistema no és sols més gran i anterior que la del 
Linux, "
 "sinó que a més nosaltres començàrem tota l'activitat."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the lowest "
 "level of the system and GNU fills technically higher levels."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
 "lot better than what people usually do, which is to omit GNU entirely and "
@@ -2116,7 +2154,7 @@
 "que allò que la gent acostuma a fer: ometre al GNU completament i fer "
 "parèixer que Linux és el sistema complet."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
 "say anything about what the system consists of.  Why shouldn't they call it "
@@ -2128,7 +2166,7 @@
 "vulguin? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames0\">#distronames0</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling a system &ldquo;Foobar Linux&rdquo; implies that it's a flavor of "
 "&ldquo;Linux,&rdquo; and people <a href=\"#distronames\">understand it that "
@@ -2137,7 +2175,7 @@
 "Anomenar un sistema «Foobar Linux» implica que és una varietat de 
«Linux», i "
 "la gent <a href=\"#distronames\">ho entén d'aquesta manera</a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If they called a GNU/Linux distro &ldquo;Foobar BSD,&rdquo; you would call "
 "that a mistake.  &ldquo;This system is not BSD,&rdquo; you would tell them.  "
@@ -2147,7 +2185,7 @@
 "és un error. Hauríeu de dir-los: «Aquest sistema no és BSD.» I de fet, "
 "tampoc és Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro is called &ldquo;Foobar Linux&rdquo;; doesn't that show it's "
 "really Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
@@ -2157,7 +2195,7 @@
 "Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
 "\">#distronames</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It means that the people who make the &ldquo;Foobar Linux&rdquo; distro are "
 "repeating the common mistake. We appreciate that distributions like Debian, "
@@ -2171,7 +2209,7 @@
 "seu nom oficial, i esperem que si esteu participant en alguna distribució, "
 "els animeu a fer el mateix."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's official name is &ldquo;Foobar Linux&rdquo;; isn't it wrong to "
 "call the distro anything but &ldquo;Foobar Linux&rdquo;? <span class="
@@ -2181,7 +2219,7 @@
 "anomenar-la de cap altra manera que no sigui «Foobar Linux»? <span class="
 "\"anchor-reference-id\">(<a href=\"#distronames1\">#distronames1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When they spread misinformation by changing &ldquo;GNU&rdquo; to &ldquo;"
 "Linux&rdquo;, and call their version of it &ldquo;Foobar Linux&rdquo;, it's "
@@ -2192,7 +2230,7 @@
 "seva versió «Foobar Linux», és adient corregir aquesta tergiversació "
 "anomenant-lo «Foobar GNU/Linux»."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be more effective to ask companies such as Mandrake, Red Hat and "
 "IBM to call their distributions &ldquo;GNU/Linux&rdquo; rather than asking "
@@ -2204,7 +2242,7 @@
 "particulars? <span class=\"anchor-reference-id\">(<a href=\"#companies"
 "\">#companies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It isn't a choice of one or the other&mdash;we ask companies and "
 "organizations and individuals to help spread the word about this.  In fact, "
@@ -2222,7 +2260,7 @@
 "diners anomenant-la ‘Linux’.» En altres paraules, a la companyia no li "
 "importava el que era cert."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We can't make them do this right, but we're not the sort to give up just "
 "because the road isn't easy.  You may not have as much influence at your "
@@ -2236,7 +2274,7 @@
 "companyies treguin més profit anomenant a les seves distribucions «GNU/"
 "Linux»."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to reserve the name &ldquo;GNU/Linux&rdquo; for "
 "distributions that are purely free software? After all, that is the ideal of "
@@ -2248,15 +2286,35 @@
 "del GNU. <span class=\"anchor-reference-id\">(<a href=\"#reserve\">#reserve</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+# | The widespread practice of adding non[---]free software to the GNU/Linux
+# | system is a major problem for our community.  It teaches the users that
+# | non[---]free software is ok, and that using it is part of the spirit of
+# | &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of
+# | their mission to help users use non[---]free add-ons, and may even invite
+# | salesmen to come and make sales pitches for them.  They adopt goals such
+# | as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them
+# | use non[---]free applications and drivers), or making the system more
+# | popular even at the cost of freedom.
+#, fuzzy
+#| msgid ""
+#| "The widespread practice of adding non-free software to the GNU/Linux "
+#| "system is a major problem for our community.  It teaches the users that "
+#| "non-free software is ok, and that using it is part of the spirit of "
+#| "&ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part "
+#| "of their mission to help users use non-free add-ons, and may even invite "
+#| "salesmen to come and make sales pitches for them.  They adopt goals such "
+#| "as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them "
+#| "use non-free applications and drivers), or making the system more popular "
+#| "even at the cost of freedom."
 msgid ""
-"The widespread practice of adding non-free software to the GNU/Linux system "
-"is a major problem for our community.  It teaches the users that non-free "
+"The widespread practice of adding nonfree software to the GNU/Linux system "
+"is a major problem for our community.  It teaches the users that nonfree "
 "software is ok, and that using it is part of the spirit of &ldquo;"
 "Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of their "
-"mission to help users use non-free add-ons, and may even invite salesmen to "
+"mission to help users use nonfree add-ons, and may even invite salesmen to "
 "come and make sales pitches for them.  They adopt goals such as &ldquo;"
-"helping the users&rdquo; of GNU/Linux (including helping them use non-free "
+"helping the users&rdquo; of GNU/Linux (including helping them use nonfree "
 "applications and drivers), or making the system more popular even at the "
 "cost of freedom."
 msgstr ""
@@ -2270,11 +2328,11 @@
 "controladors no lliures), o fer al sistema més popular a costa de la seva "
 "llibertat."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The question is how to try to change this."
 msgstr "La qüestió és com intentar canviar això."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Given that most of the community which uses GNU with Linux already does not "
 "realize that's what it is, for us to disown these adulterated versions, "
@@ -2288,13 +2346,13 @@
 "usuaris a valorar més la llibertat. No entendrien el missatge. Respondrien "
 "que mai havien pensat que aquests sistemes fossin el GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 # | The way to lead these users to see a connection with freedom is exactly
 # | the opposite: to inform them that all these system versions <em>are</em>
 # | versions of GNU, that they all are based on a system that exists
 # | specifically for the sake of the users' freedom.  With this understanding,
 # | they can start to recognize [-Lindows and so-called &ldquo;United
-# | Linux&rdquo;-] {+the distributions that include non-free software+} as
+# | Linux&rdquo;-] {+the distributions that include nonfree software+} as
 # | perverted, adulterated versions of [-GNU.-] {+GNU, instead of thinking
 # | they are proper and appropriate &ldquo;versions of Linux&rdquo;.+}
 #, fuzzy
@@ -2310,7 +2368,7 @@
 "opposite: to inform them that all these system versions <em>are</em> "
 "versions of GNU, that they all are based on a system that exists "
 "specifically for the sake of the users' freedom.  With this understanding, "
-"they can start to recognize the distributions that include non-free software "
+"they can start to recognize the distributions that include nonfree software "
 "as perverted, adulterated versions of GNU, instead of thinking they are "
 "proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgstr ""
@@ -2322,7 +2380,7 @@
 "Lindows i l'anomenat «United Linux» com versions adulterades i pervertides "
 "del GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is very useful to start GNU/Linux User Groups, which call the system GNU/"
 "Linux and adopt the ideals of the GNU Project as a basis for their "
@@ -2341,7 +2399,7 @@
 "més superflus estan en el seu dret de fer-ho, però no deixis que "
 "t'arrosseguin amb ells!"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not make a GNU distribution of Linux (sic) and call that GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
@@ -2351,7 +2409,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "All the &ldquo;Linux&rdquo; distributions are actually versions of the GNU "
 "system with Linux as the kernel.  The purpose of the term &ldquo;GNU/"
@@ -2364,7 +2422,7 @@
 "aquest punt. Desenvolupar una nova distribució anomenada «GNU/Linux» "
 "solament, enfosquiria aquest punt que volem recalcar."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "As for developing a distribution of GNU/Linux, we already did this once, "
 "when we funded the early development of Debian GNU/Linux.  To do it again "
@@ -2378,7 +2436,7 @@
 "distribució tingués uns avantatges pràctics substancials sobre les altres "
 "distribucions, no serviria per al propòsit."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Instead we help the developers of 100% free GNU/Linux distributions, such as "
 "gNewSense and Ututo."
@@ -2386,7 +2444,7 @@
 "En lloc d'això ajudem als desenvolupadors de distribucions del GNU/Linux "
 "100% lliures, com la gNewSense i l'Ututo."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not just say &ldquo;Linux is the GNU kernel&rdquo; and release some "
 "existing version of GNU/Linux under the name &ldquo;GNU&rdquo;? <span class="
@@ -2396,7 +2454,7 @@
 "versió existent del GNU/Linux amb el nom de «GNU»? <span class=\"anchor-"
 "reference-id\">(<a href=\"#linuxgnu\">#linuxgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It might have been a good idea to adopt Linux as the GNU kernel back in "
 "1992.  If we had realized, then, how long it would take to get the GNU Hurd "
@@ -2406,7 +2464,7 @@
 "pel 1992. Si ens haguéssim adonat, llavors, quant de temps ens duria fer "
 "funcionar el GNU Hurd, segurament ho hauríem fet."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we were to take an existing version of GNU/Linux and relabel it as &ldquo;"
 "GNU&rdquo;, that would be somewhat like making a version of the GNU system "
@@ -2417,7 +2475,7 @@
 "seria com agafar una versió del sistema GNU i rebatejar-la com «Linux». 
Això "
 "no estaria bé, i no volem actuar així."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Did the GNU Project condemn and oppose use of Linux in the early days? <span "
 "class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
@@ -2426,7 +2484,7 @@
 "primers dies? <span class=\"anchor-reference-id\">(<a href=\"#condemn"
 "\">#condemn</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We did not adopt Linux as our kernel, but we didn't condemn or oppose it.  "
 "In 1993 we started discussing the arrangements to sponsor the development of "
@@ -2444,7 +2502,7 @@
 "paquets GNU, de manera que poguessin funcionar en les versions GNU basades "
 "en Linux. Però els canvis a sovint es feren a propòsit i no eren portables."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who had made the changes showed little interest in cooperating "
 "with us.  One of them actually told us that he didn't care about working "
@@ -2463,7 +2521,7 @@
 "primer (i pràcticament l'únic) que no estava disposat a treballar amb "
 "nosaltres."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It was this experience that first showed us that people were calling a "
 "version of the GNU system &ldquo;Linux&rdquo;, and that this confusion was "
@@ -2476,7 +2534,7 @@
 "treball. Demanar que anomeneu al sistema «GNU/Linux» és la nostra resposta 
a "
 "aquest problema i a altres causats per dir inadequadament «Linux» al 
sistema."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why did you wait so long before asking people to use the name GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
@@ -2484,7 +2542,7 @@
 "Per què esperàreu tant per demanar a la gent que usés el nom GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually we didn't.  We began talking privately with developers and "
 "distributors about this in 1994, and made a more public campaign in 1996.  "
@@ -2494,7 +2552,7 @@
 "distribuïdors allà pel 1994 i començàrem amb la campanya pública el 
1996. "
 "Per la nostra part, continuarem tant de temps com sigui necessari."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should the GNU/<i>name</i> convention be applied to all programs that are "
 "GPL'ed? <span class=\"anchor-reference-id\">(<a href=\"#allgpled"
@@ -2504,7 +2562,7 @@
 "llicenciats amb la GPL? <span class=\"anchor-reference-id\">(<a href="
 "\"#allgpled\">#allgpled</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We never refer to individual programs as &ldquo;GNU/<i>name</i>&rdquo;.  "
 "When a program is a GNU package, we may call it &ldquo;GNU <i>name</"
@@ -2513,7 +2571,7 @@
 "Mai ens referim a un programa individual com «GNU/<i>nom</i>». Quan un "
 "programa és un paquet del GNU, acostumem a anomenar-lo «GNU <i>nom</i>»."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU, the operating system, is made up of many different programs.  Some of "
 "the programs in GNU were written as part of the GNU Project or specifically "
@@ -2525,7 +2583,7 @@
 "contribuïren específicament; aquests són els paquets GNU i acostumem a "
 "emprar el mot «GNU» en els seus noms."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It's up to the developers of a program to decide if they want to contribute "
 "it and make it a GNU package.  If you have developed a program and you would "
@@ -2539,7 +2597,7 @@
 "\">&lt;gnu@gnu.org&gt;</a>, així el podrem avaluar i decidir si el incloem "
 "com a paquet."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It wouldn't be fair to put the name GNU on every individual program that is "
 "released under the GPL.  If you write a program and release it under the "
@@ -2558,7 +2616,7 @@
 "treball independentment. Si quelcom no és un paquet del GNU, el Projecte GNU 
"
 "no pot respondre per ell i posar «GNU» en el seu nom seria impropi."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In contrast, we do deserve the overall credit for the GNU operating system "
 "as a whole, even though not for each and every program in it.  The system "
@@ -2571,7 +2629,7 @@
 "persistència des de l'any 1984, molts anys abans de que el Linux es 
comencés "
 "a desenvolupar."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The operating system in which Linux became popular was basically the same as "
 "the GNU operating system.  It was not entirely the same, because it had a "
@@ -2583,7 +2641,7 @@
 "tenia un nucli distint, però era de forma majoritària el mateix sistema. 
Era "
 "una variant del GNU. Era el sistema GNU/Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux continues to be used primarily in derivatives of that system&mdash;in "
 "today's versions of the GNU/Linux system.  What gives these systems their "
@@ -2595,7 +2653,7 @@
 "sistemes la seva identitat és que el GNU i el Linux estan al seu centre, no "
 "el Linux en solitari."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since much of GNU comes from Unix, shouldn't GNU give credit to Unix by "
 "using &ldquo;Unix&rdquo; in its name? <span class=\"anchor-reference-id\">"
@@ -2605,7 +2663,7 @@
 "reconeixement a l'Unix emprant «Unix» en el seu nom? <span class=\"anchor-"
 "reference-id\">(<a href=\"#unix\">#unix</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Actually, none of GNU comes from Unix.  Unix was proprietary software (and "
 "still is), so using any of its code in GNU would have been illegal.  This is "
@@ -2622,7 +2680,7 @@
 "substituir-lo. No podíem copiar programes, ni tampoc parts d'ells, de "
 "l'Unix; tot havia de ser escrit de nou."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "No code in GNU comes from Unix, but GNU is a Unix-compatible system; "
 "therefore, many of the ideas and specifications of GNU do come from Unix.  "
@@ -2636,13 +2694,29 @@
 "seguint la tradició dels hackers dels acrònims recursius que començà als "
 "anys 70."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.
+# |  The author of TINT wrote another implementation of TECO (there were
+# | already many of them, for various systems), but instead of calling it by a
+# | dull name like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of
+# | a clever amusing name.  (That's what hacking means: <a
+# | href=\"http{+s+}://stallman.org/articles/on-hacking.html\">playful
+# | cleverness</a>.)
+#, fuzzy
+#| msgid ""
+#| "The first such recursive acronym was TINT, &ldquo;TINT Is Not "
+#| "TECO&rdquo;.  The author of TINT wrote another implementation of TECO "
+#| "(there were already many of them, for various systems), but instead of "
+#| "calling it by a dull name like &ldquo;<em>somethingorother</em> "
+#| "TECO&rdquo;, he thought of a clever amusing name.  (That's what hacking "
+#| "means: <a href=\"http://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
 "The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
 "The author of TINT wrote another implementation of TECO (there were already "
 "many of them, for various systems), but instead of calling it by a dull name "
 "like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of a clever "
-"amusing name.  (That's what hacking means: <a href=\"http://stallman.org/";
+"amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
 "El primer acrònim recursiu fou el TINT (<cite>TINT Is Not TECO</cite> – El 
"
@@ -2652,7 +2726,7 @@
 "divertit i intel·ligent. (Això és el que significa el hacking: <a href="
 "\"http://stallman.org/articles/on-hacking.html\";>diversió amb astúcia</a>.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Other hackers enjoyed that name so much that we imitated the approach.  It "
 "became a tradition that, when you were writing from scratch a program that "
@@ -2668,7 +2742,7 @@
 "(El MINK no és el Klever). Amb aquest esperit anomenàrem a la nostra "
 "alternativa per a l'Unix <cite>GNU's Not Unix</cite>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Historically, AT&amp;T which developed Unix did not want anyone to give it "
 "credit by using &ldquo;Unix&rdquo; in the name of a similar system, not even "
@@ -2685,7 +2759,7 @@
 "totes tant propietàries com l'Unix) tenen noms completament diferents que no 
"
 "inclouen el mot «Unix»."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we say &ldquo;GNU/BSD&rdquo; too? <span class=\"anchor-reference-id\">"
 "(<a href=\"#bsd\">#bsd</a>)</span>"
@@ -2693,7 +2767,7 @@
 "Deuríem dir «GNU/BSD» també? <span class=\"anchor-reference-id\">(<a 
href="
 "\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems, "
 "because that term does not fit the history of the BSD systems."
@@ -2701,9 +2775,19 @@
 "No anomenem als sistemes BSD (FreeBSD, etc.) com sistemes «GNU/BSD», 
perquè "
 "aquest terme no s'ajusta a la història dels sistemes BSD."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The BSD system was developed by UC Berkeley as non[---]free software in
+# | the 80s, and became free in the early 90s.  A free operating system that
+# | exists today is almost certainly either a variant of the GNU system, or a
+# | kind of BSD system.
+#, fuzzy
+#| msgid ""
+#| "The BSD system was developed by UC Berkeley as non-free software in the "
+#| "80s, and became free in the early 90s.  A free operating system that "
+#| "exists today is almost certainly either a variant of the GNU system, or a "
+#| "kind of BSD system."
 msgid ""
-"The BSD system was developed by UC Berkeley as non-free software in the 80s, "
+"The BSD system was developed by UC Berkeley as nonfree software in the 80s, "
 "and became free in the early 90s.  A free operating system that exists today "
 "is almost certainly either a variant of the GNU system, or a kind of BSD "
 "system."
@@ -2713,7 +2797,7 @@
 "sistema operatiu lliure que existeixi avui en dia és, segurament, una "
 "variant del GNU o del BSD."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "People sometimes ask whether BSD too is a variant of GNU, as GNU/Linux is.  "
 "It is not.  The BSD developers were inspired to make their code free "
@@ -2727,7 +2811,7 @@
 "sol·licituds dels activistes del GNU les que ajudaren a convèncer-los, 
però "
 "el codi de poc a veure amb el del GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "BSD systems today use some GNU packages, just as the GNU system and its "
 "variants use some BSD programs; however, taken as wholes, they are two "
@@ -2741,7 +2825,7 @@
 "separat. Els desenvolupadors del BSD no van escriure un nucli i l'afegiren "
 "al sistema GNU, així que un nom com GNU/BSD no s'ajustaria a la realitat."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The connection between GNU/Linux and GNU is much closer, and that's why the "
 "name &ldquo;GNU/Linux&rdquo; is appropriate for it."
@@ -2749,7 +2833,7 @@
 "La connexió entre el GNU/Linux i el GNU és més estreta, i és per això 
que el "
 "nom «GNU/Linux» és apropiat per al sistema."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is a version of GNU which uses the kernel from NetBSD.  Its developers "
 "call it &ldquo;Debian GNU/NetBSD&rdquo;, but &ldquo;GNU/"
@@ -2763,7 +2847,7 @@
 "Aquest no és un sistema BSD, perquè la majoria del que hi ha en ell és el "
 "mateix que trobem en un sistema GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "If I install the GNU tools on Windows, does that mean I am running a GNU/"
 "Windows system? <span class=\"anchor-reference-id\">(<a href=\"#othersys"
@@ -2773,7 +2857,7 @@
 "executant un sistema GNU/Windows? <span class=\"anchor-reference-id\">(<a "
 "href=\"#othersys\">#othersys</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
 "GNU are just a part of the GNU software, which is just a part of the GNU "
@@ -2787,7 +2871,7 @@
 "té res a veure amb el GNU. Amb tot això, és una situació ben diferent a 
la "
 "del GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can't Linux be used without GNU? <span class=\"anchor-reference-id\">(<a "
 "href=\"#justlinux\">#justlinux</a>)</span>"
@@ -2795,7 +2879,7 @@
 "Linux no pot utilitzar-se sense GNU? <span class=\"anchor-reference-id\">(<a "
 "href=\"#justlinux\">#justlinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is used by itself, or with small other programs, in some appliances.  "
 "These small software systems are a far cry from the GNU/Linux system.  Users "
@@ -2810,7 +2894,7 @@
 "per mostrar fins a quin punt aquestes petites plataformes són diferents de "
 "GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How much of the GNU system is needed for the system to be GNU/Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
@@ -2818,7 +2902,7 @@
 "Quant del sistema GNU ha de contenir un sistema per ser GNU/Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "&ldquo;How much&rdquo; is not a meaningful question because the GNU system "
 "does not have precise boundaries."
@@ -2826,7 +2910,7 @@
 "«Quant» no és una pregunta que tingui sentit, perquè el sistema GNU no te 
"
 "límits precisos."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is an operating system maintained by a community.  It includes far more "
 "than just the GNU software packages (of which we have a specific list), and "
@@ -2842,7 +2926,7 @@
 "una part del sistema GNU i n'ometeu una altra, no hi ha manera de dir "
 "«quant» n'utilitzeu."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we look at the level of packages, Linux is one important package in the "
 "GNU/Linux system.  The inclusion of one important GNU package is enough to "
@@ -2852,7 +2936,7 @@
 "GNU/Linux. La inclusió d'un paquet important de GNU és suficient per "
 "justificar que demanem una menció equitativa."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Are there complete Linux systems [sic] without GNU? <span class=\"anchor-"
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
@@ -2862,7 +2946,7 @@
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There are complete systems that contain Linux and not GNU; Android is an "
 "example.  But it is a mistake to call them &ldquo;Linux&rdquo; systems, just "
@@ -2872,7 +2956,7 @@
 "Però es un error anomenar-los sistemes «Linux», igual que és un error "
 "anomenar sistema «Linux» a GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android is very different from the GNU/Linux system&mdash;because the two "
 "have very little code in common.  In fact, the only thing they have in "
@@ -2881,7 +2965,7 @@
 "Android és molt diferent del sistema GNU/Linux, perquè els dos tenen molt "
 "poc codi en comú. De fet, l'única cosa que tenen en comú és Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
 "necessary to say things like, &ldquo;Android contains Linux, but it isn't "
@@ -2893,7 +2977,7 @@
 "biblioteques i utilitats habituals de Linux [sic]», volent dir amb això el "
 "sistema GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android contains just as much of Linux as GNU/Linux does.  What it doesn't "
 "have is the GNU system.  Android replaces that with Google software that "
@@ -2905,7 +2989,7 @@
 "bastant diferent. El que fa Android diferent de GNU/Linux és l'absència de "
 "GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Is it correct to say &ldquo;using Linux&rdquo; if it refers to using GNU/"
 "Linux and using Android? <span class=\"anchor-reference-id\">(<a href="
@@ -2913,27 +2997,27 @@
 "\">#usegnulinuxandandroidlinuxsyswithoutgnu</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Far from it.  That usage is so strained that people will not understand the "
 "intended meaning."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public will find it very strange to speak of using Android as &ldquo;"
 "using Linux&rdquo;.  It's like having a conversation, then saying you were "
 "conversing with the person's intestines or the person's circulatory system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public <em>will</em> understand the idea of &ldquo;using Linux&rdquo; "
 "when it's really GNU/Linux, by way of the usual misunderstanding: thinking "
 "of the whole system as &ldquo;Linux&rdquo;."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Use of Android and use of GNU/Linux are totally different, as different as "
 "driving a car and riding a bicycle.  The fact that the first two both "
@@ -2946,7 +3030,7 @@
 "GNU/Linux and Android.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not call the system &ldquo;Linux&rdquo; anyway, and strengthen Linus "
 "Torvalds' role as posterboy for our community? <span class=\"anchor-"
@@ -2957,7 +3041,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#helplinus\">#helplinus</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Linus Torvalds is the &ldquo;posterboy&rdquo; (other people's choice of "
 "word, not ours) for his goals, not ours.  His goal is to make the system "
@@ -2975,12 +3059,30 @@
 "a> com un principi ètic, i és per això que la gent no relaciona el nom "
 "«Linux» amb aquest principi."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | Linus publicly states his disagreement with the free software movement's
+# | ideals.  He developed non[---]free software in his job for many years (and
+# | said so to a large audience at a &ldquo;Linux&rdquo;World show), and
+# | publicly invited fellow developers of Linux, the kernel, to use
+# | non[---]free software to work on it with him.  He goes even further, and
+# | rebukes people who suggest that engineers and scientists should consider
+# | social consequences of our technical work&mdash;rejecting the lessons
+# | society learned from the development of the atom bomb.
+#, fuzzy
+#| msgid ""
+#| "Linus publicly states his disagreement with the free software movement's "
+#| "ideals.  He developed non-free software in his job for many years (and "
+#| "said so to a large audience at a &ldquo;Linux&rdquo;World show), and "
+#| "publicly invited fellow developers of Linux, the kernel, to use non-free "
+#| "software to work on it with him.  He goes even further, and rebukes "
+#| "people who suggest that engineers and scientists should consider social "
+#| "consequences of our technical work&mdash;rejecting the lessons society "
+#| "learned from the development of the atom bomb."
 msgid ""
 "Linus publicly states his disagreement with the free software movement's "
-"ideals.  He developed non-free software in his job for many years (and said "
+"ideals.  He developed nonfree software in his job for many years (and said "
 "so to a large audience at a &ldquo;Linux&rdquo;World show), and publicly "
-"invited fellow developers of Linux, the kernel, to use non-free software to "
+"invited fellow developers of Linux, the kernel, to use nonfree software to "
 "work on it with him.  He goes even further, and rebukes people who suggest "
 "that engineers and scientists should consider social consequences of our "
 "technical work&mdash;rejecting the lessons society learned from the "
@@ -2996,7 +3098,7 @@
 "—menyspreant d'aquesta manera les lliçons que la societat aprengué del "
 "desenvolupament de la bomba atòmica."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with writing a free program for the motivations of "
 "learning and having fun; the kernel Linus wrote for those reasons was an "
@@ -3017,7 +3119,7 @@
 "sistema operatiu en qüestió prové del ideal de la llibertat, no de les 
idees "
 "de Linus."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong for us to label Linus Torvalds' work as GNU? <span class="
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
@@ -3026,7 +3128,7 @@
 "GNU? <span class=\"anchor-reference-id\">(<a href=\"#claimlinux"
 "\">#claimlinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong, so we don't do that.  Torvalds' work is Linux, the "
 "kernel; we are careful not to attribute that work to the GNU Project or "
@@ -3038,7 +3140,7 @@
 "qualifiquem de «GNU». Nosaltres parlem del sistema complet; el nom «GNU/"
 "Linux» reconeix la seva tasca."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Does Linus Torvalds agree that Linux is just the kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
@@ -3046,10 +3148,23 @@
 "Està Linus Torvalds d'acord amb que el Linux és sols el nucli? <span class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | He recognized this at the beginning.  The earliest Linux release notes
+# | said, <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | &ldquo;Most of the tools used with linux are GNU software and are under
+# | the GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
+# |  for more info&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
+#| "versions/RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are "
+#| "GNU software and are under the GNU copyleft. These tools aren't in the "
+#| "distribution - ask me (or GNU)  for more info&rdquo;</a>."
 msgid ""
 "He recognized this at the beginning.  The earliest Linux release notes said, "
-"<a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"<a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
 "RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are GNU software "
 "and are under the GNU copyleft. These tools aren't in the distribution - ask "
 "me (or GNU)  for more info&rdquo;</a>."
@@ -3061,7 +3176,7 @@
 "Aquestes ferramentes no estan en la distribució — pregunteu-me (a mi o a "
 "GNU) per més informació.»</a>"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not finish the GNU Hurd kernel, release the GNU system as a whole, and "
 "forget the question of what to call GNU/Linux? <span class=\"anchor-"
@@ -3071,7 +3186,7 @@
 "oblideu el tema de com s'ha d'anomenar GNU/Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#finishhurd\">#finishhurd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We would like credit for the GNU operating system no matter which kernel is "
 "used with it."
@@ -3079,13 +3194,27 @@
 "Ens agradaria tenir reconeixement pel sistema operatiu GNU amb independència 
"
 "del nucli que s'utilitzi."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | Making the GNU Hurd work well enough to compete with Linux would be a big
+# | job, and it's not clearly necessary.  The only thing ethically wrong with
+# | Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the
+# | best fix for that problem is <a
+# | [-href=\"http://fsf.org/campaigns/priority-projects\";>-]
+# | {+href=\"https://www.fsf.org/campaigns/priority-projects\";>+} developing
+# | free replacement for the blobs</a>.
+#, fuzzy
+#| msgid ""
+#| "Making the GNU Hurd work well enough to compete with Linux would be a big "
+#| "job, and it's not clearly necessary.  The only thing ethically wrong with "
+#| "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the "
+#| "best fix for that problem is <a href=\"http://fsf.org/campaigns/priority-";
+#| "projects\"> developing free replacement for the blobs</a>."
 msgid ""
 "Making the GNU Hurd work well enough to compete with Linux would be a big "
 "job, and it's not clearly necessary.  The only thing ethically wrong with "
 "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the best "
-"fix for that problem is <a href=\"http://fsf.org/campaigns/priority-projects";
-"\"> developing free replacement for the blobs</a>."
+"fix for that problem is <a href=\"https://www.fsf.org/campaigns/priority-";
+"projects\"> developing free replacement for the blobs</a>."
 msgstr ""
 "Fer que el nucli GNU Hurd funcioni prou bé com per competir amb Linux seria "
 "una feina important, i no és clarament necessari. L'única cosa errònia des 
"
@@ -3094,7 +3223,7 @@
 "fsf.org/campaigns/priority-projects\"> desenvolupar un substitut lliure de "
 "blobs</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The battle is already lost&mdash;society has made its decision and we can't "
 "change it, so why even think about it? <span class=\"anchor-reference-id\">"
@@ -3104,7 +3233,7 @@
 "canviar-la, així que per què seguir pensant amb això? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#lost\">#lost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This isn't a battle, it is a campaign of education.  What to call the system "
 "is not a single decision, to be made at one moment by &ldquo;society&rdquo;: "
@@ -3119,7 +3248,7 @@
 "No podeu fer que la resta usen el nom «GNU/Linux», però podeu decidir "
 "anomenar-lo «GNU/Linux» vosaltres mateixa—i fent-ho, estareu ajudant-nos."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Society has made its decision and we can't change it, so what good does it "
 "do if I say &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id\">(<a "
@@ -3129,7 +3258,7 @@
 "de bo anomenar al sistema «GNU/Linux»? <span class=\"anchor-reference-id\">"
 "(<a href=\"#whatgood\">#whatgood</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is not an all-or-nothing situation: correct and incorrect pictures are "
 "being spread more or less by various people.  If you call the system &ldquo;"
@@ -3150,7 +3279,7 @@
 "a un substancial número de persones amb molt poc treball. I alguns d'ells "
 "ensenyaran el nom correcte a altres."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to call the system &ldquo;Linux&rdquo; and teach "
 "people its real origin with a ten-minute explanation? <span class=\"anchor-"
@@ -3160,7 +3289,7 @@
 "vertader origen amb una explicació de deu minuts? <span class=\"anchor-"
 "reference-id\">(<a href=\"#explain\">#explain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "If you help us by explaining to others in that way, we appreciate your "
 "effort, but that is not the best method.  It is not as effective as calling "
@@ -3170,7 +3299,7 @@
 "esforç, però aquest no és el millor mètode. No és tan efectiu com 
anomenar "
 "al sistema «GNU/Linux», i fa que gasteu ineficientment el vostre temps."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is ineffective because it may not sink in, and surely will not "
 "propagate.  Some of the people who hear your explanation will pay attention, "
@@ -3186,7 +3315,7 @@
 "sistema. Segurament l'anomenaran simplement «Linux». Sense cap intenció, "
 "estaran difonent una imatge incorrecta."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is inefficient because it takes a lot more time.  Saying and writing "
 "&ldquo;GNU/Linux&rdquo; will take you only a few seconds a day, not minutes, "
@@ -3200,7 +3329,7 @@
 "Linux quan escriviu i parleu és, de lluny, el camí més fàcil per ajudar 
el "
 "Projecte GNU de forma eficient."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people laugh at you when you ask them to call the system GNU/Linux.  "
 "Why do you subject yourself to this treatment? <span class=\"anchor-"
@@ -3210,7 +3339,7 @@
 "Linux. Per què us sotmeteu a aquest tracte? <span 
class=\"anchor-reference-id"
 "\">(<a href=\"#treatment\">#treatment</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; tends to give people a mistaken "
 "picture of the system's history and reason for existence.  People who laugh "
@@ -3225,7 +3354,7 @@
 "reconeixement per aquest. Si ells saberen la veritat, probablement no se'n "
 "riurien."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Why do we take the risk of making a request that sometimes leads people to "
 "ridicule us? Because often it has useful results that help the GNU Project.  "
@@ -3236,7 +3365,7 @@
 "Correrem aquest risc de sofrir abusos immerescuts per tal d'aconseguir els "
 "nostres objectius."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you see such an ironically unfair situation occurring, please don't sit "
 "idly by.  Please teach the laughing people the real history.  When they see "
@@ -3247,7 +3376,7 @@
 "Quan vegen com es justifica la petició, tot aquell amb un poc de seny "
 "deixarà de riure's."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people condemn you when you ask them to call the system GNU/Linux.  "
 "Don't you lose by alienating them? <span class=\"anchor-reference-id\">(<a "
@@ -3257,7 +3386,7 @@
 "al sistema. No sortiu pendent quan feu que s'enfadin? <span class=\"anchor-"
 "reference-id\">(<a href=\"#alienate\">#alienate</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not much.  People who don't appreciate our role in developing the system are "
 "unlikely to make substantial efforts to help us.  If they do work that "
@@ -3273,7 +3402,7 @@
 "estan ensenyant a la gent a atribuir el nostre treball a algú altre, estan "
 "soscavant la nostra habilitat de rebre ajuda d'altres."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It makes no sense to worry about alienating people who are already mostly "
 "uncooperative, and it is self-defeating to be deterred from correcting a "
@@ -3285,7 +3414,7 @@
 "entrar en conflicte amb qui el perpetua. Per tant, seguirem tractant de "
 "corregir la confusió."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Whatever you contributed, is it legitimate to rename the operating system? "
 "<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
@@ -3294,7 +3423,7 @@
 "operatiu? <span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are not renaming anything; we have been calling this system &ldquo;"
 "GNU&rdquo; ever since we announced it in 1983.  The people who tried to "
@@ -3304,7 +3433,7 @@
 "que l'anunciàrem el 1983. Qui intentà canviar-li el nom a «Linux» no 
devia "
 "haver-ho fet."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong to force people to call the system &ldquo;GNU/Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
@@ -3312,7 +3441,7 @@
 "No és equivocat forçar a la gent a anomenar al sistema «GNU/Linux»? <span 
"
 "class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong to force them, and we don't try.  We call the system "
 "&ldquo;GNU/Linux&rdquo;, and we ask you to do it too."
@@ -3320,7 +3449,7 @@
 "Seria equivocat forçar-la i no ho intentem. Nosaltres anomenem «GNU/Linux» 
"
 "al sistema i us demanem que també ho feu vosaltres."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not sue people who call the whole system &ldquo;Linux&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
@@ -3328,7 +3457,7 @@
 " Per què no demandar a la gent que anomeni «Linux» al sistema sencer? 
<span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are no legal grounds to sue them, but since we believe in freedom of "
 "speech, we wouldn't want to do that anyway.  We ask people to call the "
@@ -3338,7 +3467,7 @@
 "d'expressió, tampoc volem fer-ho. Nosaltres simplement demanem a la gent que 
"
 "anomeni «GNU/Linux» al sistema perquè és el correcte."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Shouldn't you put something in the GNU GPL to require people to call the "
 "system &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id\">(<a href="
@@ -3348,13 +3477,31 @@
 "anomenar al sistema «GNU»? <span class=\"anchor-reference-id\">(<a href="
 "\"#require\">#require</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
+# | The purpose of the GNU GPL is to protect the users' freedom from those who
+# | would make proprietary versions of free software.  While it is true that
+# | those who call the system &ldquo;Linux&rdquo; often do things that limit
+# | the users' freedom, such as bundling non[---]free software with the
+# | GNU/Linux system or even developing non[---]free software for such use,
+# | the mere act of calling the system &ldquo;Linux&rdquo; does not, in
+# | itself, deny users their freedom.  It seems improper to make the GPL
+# | restrict what name people can use for the system.
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU GPL is to protect the users' freedom from those "
+#| "who would make proprietary versions of free software.  While it is true "
+#| "that those who call the system &ldquo;Linux&rdquo; often do things that "
+#| "limit the users' freedom, such as bundling non-free software with the GNU/"
+#| "Linux system or even developing non-free software for such use, the mere "
+#| "act of calling the system &ldquo;Linux&rdquo; does not, in itself, deny "
+#| "users their freedom.  It seems improper to make the GPL restrict what "
+#| "name people can use for the system."
 msgid ""
 "The purpose of the GNU GPL is to protect the users' freedom from those who "
 "would make proprietary versions of free software.  While it is true that "
 "those who call the system &ldquo;Linux&rdquo; often do things that limit the "
-"users' freedom, such as bundling non-free software with the GNU/Linux system "
-"or even developing non-free software for such use, the mere act of calling "
+"users' freedom, such as bundling nonfree software with the GNU/Linux system "
+"or even developing nonfree software for such use, the mere act of calling "
 "the system &ldquo;Linux&rdquo; does not, in itself, deny users their "
 "freedom.  It seems improper to make the GPL restrict what name people can "
 "use for the system."
@@ -3368,7 +3515,7 @@
 "als usuaris la seva llibertat. Seria inadequat fer que la GPL restringís "
 "quin nom poden utilitzar les persones per al sistema."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you objected to the original BSD license's advertising requirement to "
 "give credit to the University of California, isn't it hypocritical to demand "
@@ -3380,7 +3527,7 @@
 "que demaneu reconeixement per al Projecte GNU? <span class=\"anchor-"
 "reference-id\">(<a href=\"#BSDlicense\">#BSDlicense</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would be hypocritical to make the name GNU/Linux a license requirement, "
 "and we don't.  We only <em>ask</em> you to give us the credit we deserve."
@@ -3389,7 +3536,7 @@
 "llicència, i no ho fem. Sols us <em>demanem</em> que ens doneu el "
 "reconeixement que mereixem."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please note that there are at least <a href=\"/licenses/bsd.html\"> two "
 "different BSD licenses</a>.  For clarity's sake, please don't use the term "
@@ -3399,7 +3546,7 @@
 "BSD diferents</a>.  Per a major claredat, no utilitzeu si us plau "
 "l'expressió «llicència BSD» sense especificar quina."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you failed to put something in the GNU GPL to require people to call "
 "the system &ldquo;GNU&rdquo;, you deserve what happened; why are you "
@@ -3411,7 +3558,7 @@
 "ara? <span class=\"anchor-reference-id\">(<a href=\"#deserve\">#deserve</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The question presupposes a rather controversial general ethical premise: "
 "that if people do not force you to treat them fairly, you are entitled to "
@@ -3422,13 +3569,13 @@
 "no us força a tractar-la bé, teniu el dret d'aprofitar-vos-en tant com "
 "vulgueu. En altres paraules, assumeix que el poder dóna la raó."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope you disagree with that premise just as we do."
 msgstr ""
 "Esperem que estigueu desacord amb aquesta premissa, així com nosaltres ho "
 "estem."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't you be better off not contradicting what so many people believe? "
 "<span class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)"
@@ -3437,7 +3584,7 @@
 "No seria millor no contradir el que molta gent creu? <span class=\"anchor-"
 "reference-id\">(<a href=\"#contradict\">#contradict</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't think we should go along with large numbers of people because they "
 "have been misled.  We hope you too will decide that truth is important."
@@ -3445,7 +3592,7 @@
 "No creiem que hem de seguir un gran nombre de persones perquè han segut "
 "enganyats. Esperem que també us decidiu per la veritat, que és l'important."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We could never have developed a free operating system without first denying "
 "the belief, held by most people, that proprietary software was legitimate "
@@ -3455,7 +3602,7 @@
 "creença, que era acceptada per la majoria de la gent, de que el programari "
 "privatiu era legítim i acceptable."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
 "<span class=\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</"
@@ -3465,11 +3612,11 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "We don't think that the popularity of an error makes it the truth."
 msgstr "No creiem que un error acceptat per la majoria el faça cert."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it better to call the system by the name most users already know? "
 "<span class=\"anchor-reference-id\">(<a href=\"#knownname\">#knownname</a>)</"
@@ -3479,7 +3626,7 @@
 "ja el coneixen? <span class=\"anchor-reference-id\">(<a href=\"#knownname"
 "\">#knownname</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo; includes "
 "&ldquo;Linux&rdquo;, they will recognize what you're talking about.  If you "
@@ -3490,7 +3637,7 @@
 "entendran el que esteu dient.  Si afegiu una vegada »(sovint designat "
 "erròniament com a ‘Linux’)», ho entendran tot."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many people care about what's convenient or who's winning, not about "
 "arguments of right or wrong.  Couldn't you get more of their support by a "
@@ -3502,12 +3649,24 @@
 "que obtindríeu més suport de la seva part per un altre camí? <span class="
 "\"anchor-reference-id\">(<a href=\"#winning\">#winning</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+# | To care only about what's convenient or who's winning is an amoral
+# | approach to life.  Non[---]free software is an example of that amoral
+# | approach and thrives on it.  Thus, in the long run it would be
+# | self-defeating for us to adopt that approach.  We will continue talking in
+# | terms of right and wrong.
+#, fuzzy
+#| msgid ""
+#| "To care only about what's convenient or who's winning is an amoral "
+#| "approach to life.  Non-free software is an example of that amoral "
+#| "approach and thrives on it.  Thus, in the long run it would be self-"
+#| "defeating for us to adopt that approach.  We will continue talking in "
+#| "terms of right and wrong."
 msgid ""
 "To care only about what's convenient or who's winning is an amoral approach "
-"to life.  Non-free software is an example of that amoral approach and "
-"thrives on it.  Thus, in the long run it would be self-defeating for us to "
-"adopt that approach.  We will continue talking in terms of right and wrong."
+"to life.  Nonfree software is an example of that amoral approach and thrives "
+"on it.  Thus, in the long run it would be self-defeating for us to adopt "
+"that approach.  We will continue talking in terms of right and wrong."
 msgstr ""
 "Preocupar-se sols d'allò que és més beneficiós o de qui surt guanyant és 
una "
 "forma immoral de viure. El programari no lliure és un exemple d'aquesta "
@@ -3515,7 +3674,7 @@
 "per a nosaltres sotmetre's a aquesta visió. Continuarem parlant sobre allò "
 "que està bé i el que està malament."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope that you are one of those for whom right and wrong do matter."
 msgstr ""
 "Esperem que sigueu dels qui us importa el que està bé i el que és dolent."
@@ -3568,20 +3727,16 @@
 "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; 2001, [-2006, 2007, 2008,-] {+2006-2008,+} 2010, 2011,
-# | 2013, [-2014, 2015, 2016-] {+2014-2018, 2020, 2021+} Free Software
-# | Foundation, Inc.
+# | Copyright &copy; [-2014, 2015, 2016-] {+2001-2011, 2013-2018, 2020, 2021+}
+# | Free Software Foundation, Inc.
 #, fuzzy
-#| msgid ""
-#| "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, "
-#| "2016 Free Software Foundation, Inc."
+#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, 2016 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation, "
+"Inc."
+msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -3606,6 +3761,17 @@
 msgid "Updated:"
 msgstr "Updated:"
 
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, "
+#~| "2016 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
+#~ "Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, "
+#~ "2016 Free Software Foundation, Inc."
+
 #~ msgid "GNU/Linux FAQ by Richard Stallman"
 #~ msgstr "Preguntes freqüents sobre GNU/Linux per Richard Stallman"
 

Index: gnu/po/gnu-linux-faq.de-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.de-diff.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gnu/po/gnu-linux-faq.de-diff.html   8 Jun 2021 08:44:38 -0000       1.10
+++ gnu/po/gnu-linux-faq.de-diff.html   30 Aug 2021 13:34:52 -0000      1.11
@@ -10,35 +10,34 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.86</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.86</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;GNU/Linux FAQ
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/gnu/po/gnu-linux-faq.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;GNU/Linux FAQ 
by</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;GNU/Linux FAQ&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;GNU/Linux <span class="removed"><del><strong>FAQ 
by</strong></del></span> <span class="inserted"><ins><em>FAQ&lt;/h2&gt;
 
-&lt;address class="byline c"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;</strong></del></span> <span 
class="inserted"><ins><em>Stallman&lt;/address&gt;
+&lt;address class="byline"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;
 
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;To</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;To</em></ins></span> learn more about 
this issue, you can also read
+  &lt;blockquote&gt;&lt;p&gt;To learn more about this issue, you can also read
 our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
Project&lt;/a&gt;, our
  page on &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;
 and our page on &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU
-Users Who Have Never Heard of <span 
class="removed"><del><strong>GNU&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;</strong></del></span>
 <span class="inserted"><ins><em>GNU&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
-&lt;/div&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;
+Users Who Have Never Heard of GNU&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span> <span 
class="inserted"><ins><em>Stallman&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;
 When people see that we use and recommend the name GNU/Linux for a
 system that many others call just &ldquo;Linux&rdquo;, they ask many questions.
 Here are common questions, and our answers.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;div class="toc"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;h3 class="no-display"&gt;Table of Contents&lt;/h3&gt;</em></ins></span>
 &lt;ul&gt;
 
 &lt;li&gt;&lt;a href="#why"&gt;Why do you call the system we use GNU/Linux and 
not Linux?&lt;/a&gt;&lt;/li&gt;
@@ -299,7 +298,16 @@
     get more of their support by a different road?&lt;/a&gt;&lt;/li&gt;
 
 &lt;/ul&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;/div&gt;
+
+&lt;div class="announcement comment" role="complementary"&gt;
+&lt;p&gt;To learn more about this issue, you can also read
+our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
System&lt;/a&gt;, our
+ page on &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;
+and our page on &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU
+Users Who Have Never Heard of GNU&lt;/a&gt;.&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;</em></ins></span>
 
 &lt;dl&gt;
 
@@ -340,10 +348,16 @@
 
 &lt;dt id="what"&gt;What is the real relationship between GNU and Linux? 
&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#what"&gt;#what&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
-&lt;dd&gt;The GNU operating system and the Linux kernel are separate
+<span class="removed"><del><strong>&lt;dd&gt;The</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;dd&gt;
+&lt;p&gt;
+The</em></ins></span> GNU operating system and the Linux kernel are separate
 software projects that do complementary jobs.  Typically they are
 packaged in a &lt;a href="/distros/distros.html"&gt;GNU/Linux 
distribution&lt;/a&gt;, and used
-together.&lt;/dd&gt;
+<span class="removed"><del><strong>together.&lt;/dd&gt;</strong></del></span>
+<span class="inserted"><ins><em>together.&lt;/p&gt;
+&lt;/dd&gt;</em></ins></span>
 
 &lt;dt id="howerror"&gt;How did it come about that most
     people call the system &ldquo;Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#howerror"&gt;#howerror&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
@@ -456,11 +470,12 @@
           support an individual's free speech rights to call the system by
           any name that individual chooses? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#freespeech"&gt;#freespeech&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Yes, indeed, we believe you have a free speech right to call the
 operating system by any name you wish.  We ask that people call it
 GNU/Linux as a matter of doing justice to the GNU project, to promote
 the values of freedom that GNU stands for, and to inform others that
-those values of freedom brought the system into existence.
+those values of freedom brought the system into <span 
class="removed"><del><strong>existence.</strong></del></span> <span 
class="inserted"><ins><em>existence.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="everyoneknows"&gt;Since everyone knows the role
@@ -490,11 +505,12 @@
     why does it matter what name I use? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#everyoneknows2"&gt;#everyoneknows2&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 If your words don't reflect your knowledge, you don't teach others.
 Most people who have heard of the GNU/Linux system think it is
 &ldquo;Linux&rdquo;, that it was started by Linus Torvalds, and that
 it was intended to be &ldquo;open source&rdquo;.  If you don't tell
-them, who will?
+them, who <span class="removed"><del><strong>will?</strong></del></span> <span 
class="inserted"><ins><em>will?&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="windows"&gt;Isn't shortening &ldquo;GNU/Linux&rdquo;
@@ -601,19 +617,21 @@
 &lt;dt id="brain"&gt;Isn't the kernel the brain of the system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#brain"&gt;#brain&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 A computer system is not much like a human body,
 and no part of it plays a role comparable to that of
-the brain in a human.
+the brain in a <span class="removed"><del><strong>human.</strong></del></span> 
<span class="inserted"><ins><em>human.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="kernelmost"&gt;Isn't writing the kernel most of the work in an
 operating system? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#kernelmost"&gt;#kernelmost&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-No, many components take a lot of work.
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
+No, many components take a lot of <span 
class="removed"><del><strong>work.</strong></del></span> <span 
class="inserted"><ins><em>work.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="nokernel"&gt;An operating system 
requires a kernel.
+&lt;dt id="nokernel"&gt;An operating system requires a kernel.
     Since the GNU Project didn't develop a kernel, how can
     the system be GNU?&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#nokernel"&gt;#nokernel&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -632,10 +650,10 @@
 &lt;p&gt;
 Linus Torvalds made an important contribution to the operating system
 we use; the GNU Project started earlier and contributed much more.
-The name &ldquo;GNU/Linux&rdquo; gives credit to each.&lt;/p&gt;
+The name &ldquo;GNU/Linux&rdquo; gives credit to 
each.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="notinstallable"&gt;How can GNU be an
+&lt;dt id="notinstallable"&gt;How can GNU be an
     operating system, if I can't get something called &ldquo;GNU&rdquo;
     and install it? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#notinstallable"&gt;#notinstallable&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -696,11 +714,12 @@
     feel of Linux&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#feel"&gt;#feel&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 There is no such thing as the &ldquo;feel of Linux&rdquo; because
 Linux has no user interfaces.  Like any modern kernel, Linux is a base
 for running programs; user interfaces belong elsewhere in the system.
 Human interaction with GNU/Linux always goes through other programs,
-and the &ldquo;feel&rdquo; comes from them.
+and the &ldquo;feel&rdquo; comes from <span 
class="removed"><del><strong>them.</strong></del></span> <span 
class="inserted"><ins><em>them.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="long"&gt;The problem with &ldquo;GNU/Linux&rdquo; is that it is too 
long.
@@ -791,7 +810,8 @@
 may simply not recognize we're talking about the same system.  If we
 say &ldquo;GNU/Linux&rdquo;, they can make a connection to what they have heard
 about.&lt;/li&gt;
-&lt;/ul&gt;&lt;p&gt;&lt;/p&gt;
+<span 
class="removed"><del><strong>&lt;/ul&gt;&lt;p&gt;&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/ul&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="trademarkfee"&gt;I would have
@@ -845,11 +865,12 @@
     GNU/systemd/Linux? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#others"&gt;#others&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+&lt;p&gt;
 systemd is a fairly important component, but not as important as the
 kernel (Linux), nor as important as the basis of the system as a whole
 (GNU).  However, if you want to emphasize the presence of systemd
 by calling the system &ldquo;GNU/systemd/Linux&rdquo;, there is nothing
-wrong with doing so.
+wrong with doing so.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt</em></ins></span> id="others"&gt;Many other projects contributed to
@@ -921,8 +942,8 @@
 &lt;p&gt;
 We're not talking about a distinct GNU version of Linux, the kernel.
 The free GNU/Linux distros do have
-a &lt;a href="http://directory.fsf.org/project/linux"&gt;separate version of
-Linux&lt;/a&gt;, since the &ldquo;standard&rdquo; version contains non-free
+a &lt;a <span 
class="removed"><del><strong>href="http://directory.fsf.org/project/linux"&gt;separate</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://directory.fsf.org/wiki/Linux-libre"&gt;separate</em></ins></span>
 version of
+Linux&lt;/a&gt;, since the &ldquo;standard&rdquo; version contains <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
 firmware &ldquo;blobs&rdquo;.  If this were part of the GNU Project,
 it could be considered &ldquo;GNU Linux&rdquo;; but we would not want
 to call it that, because it would be too confusing.&lt;/p&gt;
@@ -1042,13 +1063,13 @@
     free software?  After all, that is the ideal of GNU. &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#reserve"&gt;#reserve&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-The widespread practice of adding non-free software to the GNU/Linux
+The widespread practice of adding <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software to the GNU/Linux
 system is a major problem for our community.  It teaches the users
-that non-free software is ok, and that using it is part of the spirit
+that <span class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software is ok, and that 
using it is part of the spirit
 of &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of 
their mission to
-help users use non-free add-ons, and may even invite salesmen to come
+help users use <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> add-ons, and may even 
invite salesmen to come
 and make sales pitches for them.  They adopt goals such as &ldquo;helping
-the users&rdquo; of GNU/Linux (including helping them use non-free
+the users&rdquo; of GNU/Linux (including helping them use <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
 applications and drivers), or making the system more popular even at
 the cost of freedom.
 &lt;p&gt;
@@ -1066,7 +1087,7 @@
 versions &lt;em&gt;are&lt;/em&gt; versions of GNU, that they all are based on a
 system that exists specifically for the sake of the users' freedom.
 With this understanding, they can start to recognize the distributions
-that include non-free software as perverted, adulterated versions of
+that include <span class="removed"><del><strong>non-free</strong></del></span> 
<span class="inserted"><ins><em>nonfree</em></ins></span> software as 
perverted, adulterated versions of
 GNU, instead of thinking they are proper and appropriate &ldquo;versions of
 Linux&rdquo;.&lt;/p&gt;
 &lt;p&gt;
@@ -1219,7 +1240,7 @@
 (there were already many of them, for various systems), but instead of
 calling it by a dull name like &ldquo;&lt;em&gt;somethingorother&lt;/em&gt; 
TECO&rdquo;, he
 thought of a clever amusing name.  (That's what hacking
-means: &lt;a href="http://stallman.org/articles/on-hacking.html"&gt;playful
+means: &lt;a <span 
class="removed"><del><strong>href="http://stallman.org/articles/on-hacking.html"&gt;playful</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://stallman.org/articles/on-hacking.html"&gt;playful</em></ins></span>
 cleverness&lt;/a&gt;.)&lt;/p&gt;
 &lt;p&gt;
 Other hackers enjoyed that name so much that we imitated the approach.
@@ -1245,7 +1266,7 @@
 We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems,
 because that term does not fit the history of the BSD systems.
 &lt;p&gt;
-The BSD system was developed by UC Berkeley as non-free software in
+The BSD system was developed by UC Berkeley as <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software in
 the 80s, and became free in the early 90s.  A free operating system
 that exists today is almost certainly either a variant of the GNU
 system, or a kind of BSD system.&lt;/p&gt;
@@ -1276,22 +1297,24 @@
 on Windows, does that mean I am running a GNU/Windows system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#othersys"&gt;#othersys&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of 
GNU
 are just a part of the GNU software, which is just a part of the GNU
 system, and underneath them you would still have another complete
 operating system which has no code in common with GNU.  All in all,
-that's a very different situation from GNU/Linux.
+that's a very different situation from <span 
class="removed"><del><strong>GNU/Linux.</strong></del></span> <span 
class="inserted"><ins><em>GNU/Linux.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="justlinux"&gt;Can't Linux be used without GNU? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#justlinux"&gt;#justlinux&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Linux is used by itself, or with small other programs, in some
 appliances.  These small software systems are a far cry from the
 GNU/Linux system.  Users do not install them on PCs, for instance, and
 would find them rather disappointing.  It is useful to say that these
 appliances run just Linux, to show how different those small platforms
-are from GNU/Linux.
+are from <span class="removed"><del><strong>GNU/Linux.</strong></del></span> 
<span class="inserted"><ins><em>GNU/Linux.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="howmuch"&gt;How much of the GNU system is needed for the system
@@ -1381,10 +1404,11 @@
 &ldquo;Linux&rdquo; with that principle.
 &lt;p&gt;
 Linus publicly states his disagreement with the free software
-movement's ideals.  He developed non-free software in his job for many
+movement's ideals.  He developed <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software in his job for many
 years (and said so to a large audience at a &ldquo;Linux&rdquo;World show), and
 publicly invited fellow developers of Linux, the kernel, to use
-non-free software to work on it with him.  He goes even further, and
+<span class="removed"><del><strong>non-free</strong></del></span>
+<span class="inserted"><ins><em>nonfree</em></ins></span> software to work on 
it with him.  He goes even further, and
 rebukes people who suggest that engineers and scientists should
 consider social consequences of our technical work&mdash;rejecting the
 lessons society learned from the development of the atom bomb.&lt;/p&gt;
@@ -1403,11 +1427,13 @@
     work as GNU? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#claimlinux"&gt;#claimlinux&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 It would be wrong, so we don't do that.  Torvalds' work is Linux, the
 kernel; we are careful not to attribute that work to the GNU Project
 or label it as &ldquo;GNU&rdquo;.  When we talk about the whole
 system, the name &ldquo;GNU/Linux&rdquo; gives him a share of the
-credit.
+<span class="removed"><del><strong>credit.</strong></del></span>
+<span class="inserted"><ins><em>credit.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 
@@ -1417,7 +1443,8 @@
 &lt;dd&gt;
 &lt;p&gt;He recognized this at the beginning.  The earliest Linux release notes
 said, &lt;a
-href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+<span 
class="removed"><del><strong>href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
 &ldquo;Most of the tools used with linux are GNU software and are under the
 GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
 for more info&rdquo;&lt;/a&gt;.&lt;/p&gt;
@@ -1435,7 +1462,7 @@
 a big job, and it's not clearly necessary.  The only thing ethically
 wrong with Linux as a kernel is its inclusion of firmware
 &ldquo;blobs&rdquo;; the best fix for that problem
-is &lt;a href="http://fsf.org/campaigns/priority-projects"&gt; developing
+is &lt;a <span 
class="removed"><del><strong>href="http://fsf.org/campaigns/priority-projects"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.fsf.org/campaigns/priority-projects"&gt;</em></ins></span>
 developing
 free replacement for the blobs&lt;/a&gt;.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -1444,12 +1471,13 @@
     it? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#lost"&gt;#lost&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 This isn't a battle, it is a campaign of education.  What to call the
 system is not a single decision, to be made at one moment by
 &ldquo;society&rdquo;: each person, each organization, can decide what
 name to use.  You can't make others say &ldquo;GNU/Linux&rdquo;, but
 you can decide to call the system &ldquo;GNU/Linux&rdquo;
-yourself&mdash;and by doing so, you will help educate others.
+yourself&mdash;and by doing so, you will help educate <span 
class="removed"><del><strong>others.</strong></del></span> <span 
class="inserted"><ins><em>others.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="whatgood"&gt;Society has made its
@@ -1457,6 +1485,7 @@
     &ldquo;GNU/Linux&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#whatgood"&gt;#whatgood&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 This is not an all-or-nothing situation: correct and incorrect
 pictures are being spread more or less by various people.  If you call
 the system &ldquo;GNU/Linux&rdquo;, you will help others learn the system's 
true
@@ -1464,7 +1493,7 @@
 everywhere on your own, any more than we can, but you can help.  If
 only a few hundred people see you use the term &ldquo;GNU/Linux&rdquo;, you 
will
 have educated a substantial number of people with very little work.
-And some of them will spread the correction to others.
+And some of them will spread the correction to <span 
class="removed"><del><strong>others.</strong></del></span> <span 
class="inserted"><ins><em>others.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="explain"&gt;Wouldn't it be better to call
@@ -1535,39 +1564,44 @@
     is it legitimate to rename the operating system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#rename"&gt;#rename&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 We are not renaming anything; we have been calling this system 
&ldquo;GNU&rdquo;
 ever since we announced it in 1983.  The people who tried to rename
-it to &ldquo;Linux&rdquo; should not have done so.&lt;/dd&gt;
+it to &ldquo;Linux&rdquo; should not have done <span 
class="removed"><del><strong>so.&lt;/dd&gt;</strong></del></span> <span 
class="inserted"><ins><em>so.&lt;/p&gt;
+&lt;/dd&gt;</em></ins></span>
 
 &lt;dt id="force"&gt;Isn't it wrong to force people to call
 the system &ldquo;GNU/Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#force"&gt;#force&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 It would be wrong to force them, and we don't try.  We call the system
-&ldquo;GNU/Linux&rdquo;, and we ask you to do it too.
+&ldquo;GNU/Linux&rdquo;, and we ask you to do it <span 
class="removed"><del><strong>too.</strong></del></span> <span 
class="inserted"><ins><em>too.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="whynotsue"&gt;Why not sue people who call
 the whole system &ldquo;Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#whynotsue"&gt;#whynotsue&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 There are no legal grounds to sue them, but since we believe in
 freedom of speech, we wouldn't want to do that anyway.  We ask people
-to call the system &ldquo;GNU/Linux&rdquo; because that is the right thing to 
do.
+to call the system &ldquo;GNU/Linux&rdquo; because that is the right thing to 
<span class="removed"><del><strong>do.</strong></del></span> <span 
class="inserted"><ins><em>do.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="require"&gt;Shouldn't you put something in
     the GNU GPL to require people to call the system &ldquo;GNU&rdquo;? 
&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#require"&gt;#require&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 The purpose of the GNU GPL is to protect the users' freedom from those
 who would make proprietary versions of free software.  While it is
 true that those who call the system &ldquo;Linux&rdquo; often do things that 
limit
-the users' freedom, such as bundling non-free software with the
-GNU/Linux system or even developing non-free software for such use,
+the users' freedom, such as bundling <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software with the
+GNU/Linux system or even developing <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software for such use,
 the mere act of calling the system &ldquo;Linux&rdquo; does not, in itself, 
deny
 users their freedom.  It seems improper to make the GPL restrict what
-name people can use for the system.
+name people can use for the <span 
class="removed"><del><strong>system.</strong></del></span> <span 
class="inserted"><ins><em>system.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="BSDlicense"&gt;Since you objected to the original BSD license's
@@ -1615,17 +1649,19 @@
 it &ldquo;Linux&rdquo;, doesn't that make it right? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#somanyright"&gt;#somanyright&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-We don't think that the popularity of an error makes it the truth.
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
+We don't think that the popularity of an error makes it the <span 
class="removed"><del><strong>truth.</strong></del></span> <span 
class="inserted"><ins><em>truth.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="knownname"&gt;Isn't it better to call the
     system by the name most users already know? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#knownname"&gt;#knownname&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo;
 includes &ldquo;Linux&rdquo;, they will recognize what you're talking
 about.  If you add &ldquo;(often erroneously referred to as
-&lsquo;Linux&rsquo;)&rdquo; once in a while, they will all understand.
+&lsquo;Linux&rsquo;)&rdquo; once in a while, they will all <span 
class="removed"><del><strong>understand.</strong></del></span> <span 
class="inserted"><ins><em>understand.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="winning"&gt;Many people care about what's
@@ -1635,7 +1671,7 @@
 
 &lt;dd&gt;
 To care only about what's convenient or who's winning is an amoral
-approach to life.  Non-free software is an example of that amoral
+approach to life.  <span 
class="removed"><del><strong>Non-free</strong></del></span>  <span 
class="inserted"><ins><em>Nonfree</em></ins></span> software is an example of 
that amoral
 approach and thrives on it.  Thus, in the long run it would be
 self-defeating for us to adopt that approach.  We will continue
 talking in terms of right and wrong.
@@ -1644,8 +1680,7 @@
 &lt;/dd&gt;
 
 &lt;/dl&gt;
-<span class="inserted"><ins><em>&lt;/div&gt;
-&lt;/div&gt;</em></ins></span>
+<span class="inserted"><ins><em>&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;
@@ -1694,7 +1729,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2001, <span class="removed"><del><strong>2006, 2007, 
2008,</strong></del></span> <span 
class="inserted"><ins><em>2006-2008,</em></ins></span> 2010, 2011, 2013, <span 
class="removed"><del><strong>2014, 2015, 2016, 2017, 2018</strong></del></span> 
<span class="inserted"><ins><em>2014-2018, 2020, 2021</em></ins></span>
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>2001, 2006, 2007, 
2008, 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018</strong></del></span> 
<span class="inserted"><ins><em>2001-2011, 2013-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"
@@ -1705,7 +1740,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/06/08 08:44:38 $
+$Date: 2021/08/30 13:34:52 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: gnu/po/gnu-linux-faq.de.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.de.po,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- gnu/po/gnu-linux-faq.de.po  31 May 2021 13:39:47 -0000      1.124
+++ gnu/po/gnu-linux-faq.de.po  30 Aug 2021 13:34:52 -0000      1.125
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
 "Report-Msgid-Bugs-To: Webmasters <webmasters@gnu.org>\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2018-04-12 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"
@@ -22,32 +22,18 @@
 msgid "GNU/Linux FAQ - GNU Project - Free Software Foundation"
 msgstr "GNU/Linux: Häufige Fragen - GNU-Projekt - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU/Linux FAQ"
 msgstr ""
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 # || No change detected.  The change might only be in amounts of spaces.
 #, fuzzy
 #| msgid "by Richard Stallman"
 msgid "by Richard Stallman"
 msgstr "von <strong>Richard Stallman</strong>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
-"linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a href=\"/"
-"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Um weitere Informationen zu diesem Thema zu erhalten, siehe <cite><a href=\"/"
-"gnu/gnu-users-never-heard-of-gnu\">GNU-Benutzer, die noch nie von GNU gehört 
"
-"haben</a></cite>, <cite><a href=\"/gnu/why-gnu-linux\">GNU/Linux. Ist der "
-"Name Schall und Rauch?</a></cite> und <cite><a href=\"/gnu/linux-and-gnu"
-"\">Das GNU-System und Linux</a></cite>."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When people see that we use and recommend the name GNU/Linux for a system "
 "that many others call just &ldquo;Linux&rdquo;, they ask many questions.  "
@@ -57,6 +43,13 @@
 "das viele <ins>fälschlicherweise</ins> nur <em>„Linux“</em> nennen, 
treten "
 "dazu häufig viele Fragen auf. Hier einige <ins>meiner</ins> Antworten:"
 
+#. type: Content of: <div><div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "Inhaltsverzeichnis"
+
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<a href=\"#why\">Why do you call the system we use GNU/Linux and not Linux?</"
@@ -686,7 +679,34 @@
 "wer gewinnt, nicht ob Thesen richtig oder falsch sind. Könnte man nicht mehr 
"
 "von deren Unterstützung durch einen anderen Weg bekommen?</a>"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
+# | {+System</a>,+} our page on <a href=\"/gnu/why-gnu-linux.html\">Why
+# | GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our page on <a href=\"/"
+#| "gnu/linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a "
+#| "href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
+"linux-and-gnu.html\">Linux and the GNU System</a>, our page on <a href=\"/"
+"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Um weitere Informationen zu diesem Thema zu erhalten, siehe <cite><a href=\"/"
+"gnu/gnu-users-never-heard-of-gnu\">GNU-Benutzer, die noch nie von GNU gehört 
"
+"haben</a></cite>, <cite><a href=\"/gnu/why-gnu-linux\">GNU/Linux. Ist der "
+"Name Schall und Rauch?</a></cite> und <cite><a href=\"/gnu/linux-and-gnu"
+"\">Das GNU-System und Linux</a></cite>."
+
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you call the system we use GNU/Linux and not Linux? <span class="
 "\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>"
@@ -694,7 +714,7 @@
 "Warum wird das benutzte System <b>GNU/Linux</b> genannt, nicht 
<em>„Linux“</"
 "em>? <span class=\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Most operating system distributions based on Linux as kernel are basically "
 "modified versions of the GNU operating system.  We began developing GNU in "
@@ -714,12 +734,12 @@
 "den größten Einzelbeitrag zum Gesamtsystem bildeten. Die grundlegende 
Vision "
 "war ebenfalls unsere. "
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "In fairness, we ought to get at least equal mention."
 msgstr ""
 "Der Fairness halber sollten wir wenigstens die gleiche Erwähnung bekommen. "
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and the GNU System</a> and <a "
 "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
@@ -732,7 +752,7 @@
 "<a href=\"/gnu/the-gnu-project\"><cite>Über das Projekt ‚GNU‘</cite></a> 
zur "
 "Historie."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why is the name important? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
@@ -740,7 +760,7 @@
 "Warum ist der Name wichtig? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Although the developers of Linux, the kernel, are contributing to the free "
 "software community, many of them do not care about freedom.  People who "
@@ -756,7 +776,7 @@
 "haben. Dann schenken sie den Ansichten jener Entwickler eine übermäßige "
 "Bedeutung."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Calling the system GNU/Linux recognizes the role that our idealism played in "
 "building our community, and <a href=\"/gnu/why-gnu-linux.html\">helps the "
@@ -767,7 +787,7 @@
 "gnu/why-gnu-linux\">hilft der Öffentlichkeit die praktische Bedeutung dieser 
"
 "Ideale zu erkennen</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the real relationship between GNU and Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#what\">#what</a>)</span>"
@@ -775,7 +795,7 @@
 "Was ist die wahre Beziehung zwischen <em>GNU</em> und <em>Linux</em>? <span "
 "class=\"anchor-reference-id\">(<a href=\"#what\">#what</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU operating system and the Linux kernel are separate software projects "
 "that do complementary jobs.  Typically they are packaged in a <a href=\"/"
@@ -786,7 +806,7 @@
 "href=\"/distros/\">GNU/Linux-Distribution</a> verpackt und gemeinsam "
 "eingesetzt."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How did it come about that most people call the system &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
@@ -796,7 +816,7 @@
 "nennen? <span class=\"anchor-reference-id\">(<a href=\"#howerror"
 "\">#howerror</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; is a confusion that has spread faster "
 "than the corrective information."
@@ -804,7 +824,7 @@
 "Das System <em>„Linux“</em> zu nennen ist ein Verwirrspiel, das sich "
 "schneller verbreitet hat als die korrigierende Information."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who combined Linux with the GNU system were not aware that that's "
 "what their activity amounted to.  They focused their attention on the piece "
@@ -823,7 +843,7 @@
 "und um dann zu bitten, die Gewohnheit zu korrigieren. Bis dahin hatte das "
 "Durcheinander schon einen großen Vorsprung."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the people who call the system &ldquo;Linux&rdquo; have never heard "
 "why that's not the right thing.  They saw others using that name and assume "
@@ -842,7 +862,7 @@
 "Torvalds hätte 1991 begonnen. Dieses falsche Bild neigt die Idee zu "
 "verstärken, dass das System <em>„Linux“</em> genannt werden sollte."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Many of the questions in this file represent people's attempts to justify "
 "the name they are accustomed to using."
@@ -850,7 +870,7 @@
 "Viele der hier gestellten Fragen stellen Versuche dar, den Namen zu "
 "rechtfertigen, den Benutzer gewohnt sind zu verwenden."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we always say &ldquo;GNU/Linux&rdquo; instead of &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
@@ -858,7 +878,7 @@
 "Sollte immer <b>GNU/Linux</b> statt <em>„Linux“</em> gesagt werden? <span 
"
 "class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not always&mdash;only when you're talking about the whole system.  When "
 "you're referring specifically to the kernel, you should call it &ldquo;"
@@ -868,7 +888,7 @@
 "Bezieht man sich konkret auf den Betriebssystemkern, sollten es  <em>Linux</"
 "em> genannt werden, den von seinem Entwickler gewählten Namen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
 "call the whole system by the same name as the kernel.  This causes many "
@@ -884,7 +904,7 @@
 "Gesamtsystem <b>GNU/Linux</b> und der Systemkern <em>Linux</em> genannt "
 "wird, vermeidet man die Mehrdeutigkeit."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Would Linux have achieved the same success if there had been no GNU? <span "
 "class=\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</"
@@ -894,7 +914,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In that alternative world, there would be nothing today like the GNU/Linux "
 "system, and probably no free operating system at all.  No one attempted to "
@@ -908,7 +928,7 @@
 "Berkeley, die insbesondere vom GNU-Projekt gebeten wurden, ihren Quellcode "
 "frei zu geben, ein freies Betriebssystem zu entwickeln."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds was partly influenced by a speech about GNU in Finland in "
 "1990.  It's possible that even without this influence he might have written "
@@ -922,7 +942,7 @@
 "keine Freie Software geworden. Linux wurde, als Linus es erneut unter der "
 "GNU GPL freigab, 1992 frei (siehe Versionshinweise für Version 0.12)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Even if Torvalds had released Linux under some other free software license, "
 "a free kernel alone would not have made much difference to the world.  The "
@@ -934,7 +954,7 @@
 "bewegt. Die Bedeutung von Linux kam davon, in einem größeren Rahmen, einem "
 "komplett freien Betriebssystem zu passen: GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better for the community if you did not divide people with "
 "this request? <span class=\"anchor-reference-id\">(<a href=\"#divide"
@@ -944,7 +964,7 @@
 "Aufforderung nicht entzweit? <span class=\"anchor-reference-id\">(<a href="
 "\"#divide\">#divide</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
 "people.  We are asking them to give the GNU Project credit for the GNU "
@@ -954,7 +974,7 @@
 "Wir bitten darum, dem GNU-Projekt Anerkennung für das GNU-Betriebssystem zu "
 "schenken. Dies kritisiert oder verdrängt niemanden."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, there are people who do not like our saying this.  Sometimes those "
 "people push us away in response.  On occasion they are so rude that one "
@@ -968,7 +988,7 @@
 "Es bringt uns nicht zum Schweigen, aber tendiert dazu, die Gemeinschaft zu "
 "spalten; deswegen hoffen wir, dass Sie sie überzeugen können aufzuhören."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, this is only a secondary cause of division in our community.  The "
 "largest division in the community is between people who appreciate free "
@@ -985,7 +1005,7 @@
 "anführen und Freie Software nur als effizientes Entwicklungsmodell "
 "präsentieren (Open-Source-Bewegung)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This disagreement is not just a matter of names&mdash;it is a matter of "
 "differing basic values.  It is essential for the community to see and think "
@@ -1002,7 +1022,7 @@
 "source-misses-the-point\"><cite>Warum Open Source das Ziel von Freie "
 "Software verfehlt</cite></a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The disagreement over values partially aligns with the amount of attention "
 "people pay to the GNU Project's role in our community.  People who value "
@@ -1028,7 +1048,7 @@
 "(was nicht einfach sein wird) oder vollständig besiegt werden (hoffentlich "
 "nicht)."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Doesn't the GNU project support an individual's free speech rights to call "
 "the system by any name that individual chooses? <span class=\"anchor-"
@@ -1039,7 +1059,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#freespeech\">#freespeech</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Yes, indeed, we believe you have a free speech right to call the operating "
 "system by any name you wish.  We ask that people call it GNU/Linux as a "
@@ -1053,7 +1073,7 @@
 "Freiheit zu fördern, für die GNU steht und andere zu informieren, dass 
diese "
 "Werte das System ins Leben gerufen haben."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since everyone knows the role of GNU in developing the system, doesn't the "
 "&ldquo;GNU/&rdquo; in the name go without saying? <span class=\"anchor-"
@@ -1064,7 +1084,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#everyoneknows\">#everyoneknows</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Experience shows that the system's users, and the computer-using public in "
 "general, often know nothing about the GNU system.  Most articles about the "
@@ -1079,7 +1099,7 @@
 "\"><cite>GNU-Nutzer, die noch nie von GNU gehört haben</cite></a> gibt "
 "weitere Auskunft."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who say this are probably geeks thinking of the geeks they know.  "
 "Geeks often do know about GNU, but many have a completely wrong idea of what "
@@ -1092,7 +1112,7 @@
 "viele, es sei eine Sammlung von <a href=\"#tools\"><em>Hilfsprogrammen</em></"
 "a> oder ein Projekt zur Entwicklung von Hilfsprogrammen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The wording of this question, which is typical, illustrates another common "
 "misconception.  To speak of &ldquo;GNU's role&rdquo; in developing something "
@@ -1107,7 +1127,7 @@
 "Projekt in dieser oder einer anderen Aktivität zu sprechen, nicht jedoch von 
"
 "<em>die von GNU</em> zu sprechen."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since I know the role of GNU in this system, why does it matter what name I "
 "use? <span class=\"anchor-reference-id\">(<a href="
@@ -1117,7 +1137,7 @@
 "welcher Name benutzt wird? <span class=\"anchor-reference-id\">(<a href="
 "\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your words don't reflect your knowledge, you don't teach others.  Most "
 "people who have heard of the GNU/Linux system think it is &ldquo;"
@@ -1129,7 +1149,7 @@
 "<em>„Linux“</em>, wurde von Linus Torvalds gestartet und sei <em>offener "
 "Quellcode</em> ‚Open Source‘. Wenn Sie es ihnen nicht erklären, wer 
dann?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't shortening &ldquo;GNU/Linux&rdquo; to &ldquo;Linux&rdquo; just like "
 "shortening &ldquo;Microsoft Windows&rdquo; to &ldquo;Windows&rdquo;? <span "
@@ -1139,7 +1159,7 @@
 "<em>Microsoft Windows</em> mit <em>Windows</em> abzukürzen? <span class="
 "\"anchor-reference-id\">(<a href=\"#windows\">#windows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It's useful to shorten a frequently-used name, but not if the abbreviation "
 "is misleading."
@@ -1147,7 +1167,7 @@
 "Es ist sinnvoll, einen häufig verwendeten Namen abzukürzen, aber nicht, 
wenn "
 "die Abkürzung irreführend ist."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Almost everyone in developed countries really does know that the &ldquo;"
 "Windows&rdquo; system is made by Microsoft, so shortening &ldquo;Microsoft "
@@ -1162,7 +1182,7 @@
 "abzukürzen, vermittelt eine falsche Vorstellung davon, wo das System her "
 "kommt."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The question is itself misleading because GNU and Microsoft are not the same "
 "kind of thing.  Microsoft is a company; GNU is an operating system."
@@ -1170,7 +1190,7 @@
 "Die Frage selbst ist irreführend, weil GNU und Microsoft nicht dasselbe ist. 
"
 "Microsoft ist ein Unternehmen, GNU ein Betriebssystem."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't GNU a collection of programming tools that were included in Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
@@ -1179,7 +1199,7 @@
 "enthalten ist? <span class=\"anchor-reference-id\">(<a href=\"#tools"
 "\">#tools</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "People who think that Linux is an entire operating system, if they hear "
 "about GNU at all, often get a wrong idea of what GNU is.  They may think "
@@ -1198,7 +1218,7 @@
 "Name eines Betriebssystems ist, ist schwer in einen konzeptionellen Rahmen "
 "einzuordnen, in dem das Betriebssystem mit <em>„Linux“</em> bezeichnet 
wird."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Project was named after the GNU operating system&mdash;it's the "
 "project to develop the GNU system.  (See <a href=\"/gnu/initial-announcement."
@@ -1209,7 +1229,7 @@
 "announcement\"><cite>Neue Unix-Implementierung: Ursprüngliche Ankündigung "
 "[des GNU-Projekts]</cite> (von 1983)</a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We developed programs such as GCC, GNU Emacs, GAS, GLIBC, BASH, etc., "
 "because we needed them for the GNU operating system.  GCC, the GNU Compiler "
@@ -1225,7 +1245,7 @@
 "<em>Ghostscript</em>, <em>GNUCash</em>, <em>GNU Chess</em> und <em>GNOME</"
 "em> für das GNU-System."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the difference between an operating system and a kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
@@ -1234,7 +1254,7 @@
 "<em>Betriebssystemkern</em> ‚Kernel‘? <span 
class=\"anchor-reference-id\">"
 "(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "An operating system, as we use the term, means a collection of programs that "
 "are sufficient to use the computer to do a wide variety of jobs.  A general "
@@ -1246,7 +1266,7 @@
 "benutzen. Ein universelles Betriebssystem sollte, um vollständig zu sein, "
 "alle Aufgaben handhaben können, die viele Benutzer durchführen wollen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The kernel is one of the programs in an operating system&mdash;the program "
 "that allocates the machine's resources to the other programs that are "
@@ -1257,7 +1277,7 @@
 "Systemressourcen zuweist. Der Betriebssystemkern kümmert sich auch um das "
 "Starten und Stoppen anderer Programme."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "To confuse matters, some people use the term &ldquo;operating system&rdquo; "
 "to mean &ldquo;kernel&rdquo;.  Both uses of the term go back many years.  "
@@ -1278,7 +1298,7 @@
 "enthielt sogar Spiele. Da GNU ein unixoides Betriebssystem werden sollte, "
 "verwendeten wir den Begriff <em>Betriebssystem</em> auf die gleiche Weise."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the time when people speak of the &ldquo;Linux operating "
 "system&rdquo; they are using &ldquo;operating system&rdquo; in the same "
@@ -1295,7 +1315,7 @@
 "der richtige Name dafür, aber bitte auch <em>Betriebssystemkern</em>, um "
 "Unklarheiten zu vermeiden, welcher Teil der Software gemeint ist."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
@@ -1306,7 +1326,7 @@
 "<em>Betriebssystem</em> für die gesamte Programmsammlung verwenden möchten, 
"
 "ist das schön. Dann würden Sie über GNU/Linux-Distributionen sprechen."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The kernel of a system is like the foundation of a house.  How can a house "
 "be almost complete when it doesn't have a foundation? <span class=\"anchor-"
@@ -1316,7 +1336,7 @@
 "kann ein Haus fast komplett sein, wenn es kein Fundament hat? <span class="
 "\"anchor-reference-id\">(<a href=\"#house\">#house</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "A kernel is not much like the foundation of a house because building an "
 "operating system is not much like building a house."
@@ -1324,7 +1344,7 @@
 "Ein Betriebssystemkern ist nicht ganz wie das Fundament eines Hauses, weil "
 "ein Betriebssystem aufzubauen nicht ganz wie das Aufbauen eines Hauses ist."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A house is built from lots of little general parts that are cut and put "
 "together in situ.  They have to be put together from the bottom up.  Thus, "
@@ -1337,7 +1357,7 @@
 "wesentliches Gewerk nicht errichtet worden; alles was man hat ist ein Loch "
 "im Boden."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "By contrast, an operating system consists of complex components that can be "
 "developed in any order.  When you have developed most of the components, "
@@ -1353,7 +1373,7 @@
 "Raumstationmodule in der Umlaufbahn sind, aber auf ein anderes wichtiges "
 "Modul gewartet werden würde, wäre das wie das GNU-System im Jahr 1992."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't the kernel the brain of the system? <span class=\"anchor-reference-id"
 "\">(<a href=\"#brain\">#brain</a>)</span>"
@@ -1361,7 +1381,7 @@
 "Ist der Betriebssystemkern nicht das Gehirn des Systems? <span class="
 "\"anchor-reference-id\">(<a href=\"#brain\">#brain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A computer system is not much like a human body, and no part of it plays a "
 "role comparable to that of the brain in a human."
@@ -1369,7 +1389,7 @@
 "Ein Rechnersystem ist nicht so wie ein menschlicher Körper, und kein Teil "
 "spielt eine mit der des menschlichen Gehirns vergleichbare Rolle."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't writing the kernel most of the work in an operating system? <span "
 "class=\"anchor-reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</"
@@ -1379,11 +1399,11 @@
 "Betriebssystemkerns? <span class=\"anchor-reference-id\">(<a href="
 "\"#kernelmost\">#kernelmost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "No, many components take a lot of work."
 msgstr "Nein, viele Komponenten bedeuten eine Menge Arbeit."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Isn't writing-]{+An operating system requires a kernel.  Since+} the
 # | [-kernel most of-] {+GNU Project didn't develop a kernel, how can+} the
 # | [-work in an operating system? <span-] {+system be GNU?<span+}
@@ -1404,7 +1424,7 @@
 "Betriebssystemkerns? <span class=\"anchor-reference-id\">(<a href="
 "\"#kernelmost\">#kernelmost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The people who argue that way for calling the system &ldquo;Linux&rdquo; are "
 "using a double standard.  An operating system requires compilers, editors, "
@@ -1413,20 +1433,20 @@
 "any of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "That standard is too strict, not the right way to judge the contributions of "
 "any contributor."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds made an important contribution to the operating system we "
 "use; the GNU Project started earlier and contributed much more.  The name "
 "&ldquo;GNU/Linux&rdquo; gives credit to each."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How can GNU be an operating system, if I can't get something called &ldquo;"
 "GNU&rdquo; and install it? <span class=\"anchor-reference-id\">(<a href="
@@ -1436,7 +1456,7 @@
 "überhaupt nicht erhalten und installieren kann? <span class=\"anchor-"
 "reference-id\">(<a href=\"#notinstallable\">#notinstallable</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Many <a href=\"/distros/distros.html\"> packaged and installable versions of "
 "GNU</a> are available.  None of them is called simply &ldquo;GNU&rdquo;, but "
@@ -1446,7 +1466,7 @@
 "von GNU</a> sind verfügbar. Keine davon wird einfach nur <em>‚GNU‘</em> "
 "genannt, aber GNU ist genau das, was sie im Grunde genommen sind."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We expected to release the GNU system packaged for installation, but this "
 "plan was overtaken by events: in 1992 others were already packaging GNU "
@@ -1468,7 +1488,7 @@
 "dem <b>GNU Hurd</b>-Systemkern sein&#160;&#8209;&#160;der noch nicht fertig "
 "war."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Hurd kernel never became sufficiently ready; we only recommend it to "
 "those interested in working on it.  So we never packaged GNU with the GNU "
@@ -1479,7 +1499,7 @@
 "haben wir GNU niemals mit dem GNU Hurd-Systemkern gebündelt. Jedoch 
bündelte "
 "Debian diese Kombination: als <b>Debian GNU/Hurd</b>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are now developing an advanced Scheme-based package manager called Guix "
 "and a complete system distribution based on it called the <a href=\"/"
@@ -1492,7 +1512,7 @@
 "kurz <b>GuixSD</b>. Dies schließt einen wesentlichen Teil des GNU-Systems "
 "neu zu verpacken ein."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We never took the last step of packaging GNU under the name &ldquo;"
 "GNU&rdquo;, but that doesn't alter what kind of thing GNU is.  GNU is an "
@@ -1502,7 +1522,7 @@
 "zu verpacken, aber das ändert nichts daran was GNU ist: GNU ist ein "
 "Betriebssystem."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "We're calling the whole system after the kernel, Linux.  Isn't it normal to "
 "name an operating system after a kernel? <span class=\"anchor-reference-id\">"
@@ -1513,7 +1533,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#afterkernel\">#afterkernel</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "That practice seems to be very rare&mdash;we can't find any examples other "
 "than the misuse of the name &ldquo;Linux&rdquo;.  Normally an operating "
@@ -1530,7 +1550,7 @@
 "stattdessen sagt man <em>der Betriebssystemkern von so-und-so</em> oder "
 "<em>der so-und-so-Betriebssystemkern</em>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Because those two constructions are used synonymously, the expression &ldquo;"
 "the Linux kernel&rdquo; can easily be misunderstood as meaning &ldquo;the "
@@ -1546,7 +1566,7 @@
 "Betriebssystemkern, Linux,</em> oder <em>Linux, der Betriebssystemkern,</em> "
 "sagt oder schreibt."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can another system have &ldquo;the feel of Linux&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
@@ -1554,7 +1574,7 @@
 "Kann ein anderes System „das Gefühl von Linux” vermitteln? <span class="
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is no such thing as the &ldquo;feel of Linux&rdquo; because Linux has "
 "no user interfaces.  Like any modern kernel, Linux is a base for running "
@@ -1568,7 +1588,7 @@
 "System. Menschliche Interaktion mit GNU/Linux geschieht immer durch andere "
 "Programme, und das „Gefühl“ kommt von ihnen."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  How about "
 "recommending a shorter name? <span class=\"anchor-reference-id\">(<a href="
@@ -1578,7 +1598,7 @@
 "kürzeren Namen zu empfehlen? <span class=\"anchor-reference-id\">(<a href="
 "\"#long\">#long</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "For a while we tried the name &ldquo;LiGNUx&rdquo;, which combines the words "
 "&ldquo;GNU&rdquo; and &ldquo;Linux&rdquo;.  The reaction was very bad.  "
@@ -1588,7 +1608,7 @@
 "<em>GNU</em> und <em>Linux</em> vereint. Die Reaktion war sehr schlecht. "
 "<b>GNU/Linux</b> wurde viel besser akzeptiert."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
 "call it &ldquo;GNU/Linux&rdquo; <a href=\"#justgnu\"> for the reasons given "
@@ -1598,7 +1618,7 @@
 "den <a href=\"#justgnu\">nachstehend angegebenen Gründen</a> <strong>GNU/"
 "Linux</strong>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How about calling the system &ldquo;GliNUx&rdquo; (instead of &ldquo;GNU/"
 "Linux&rdquo;)? <span class=\"anchor-reference-id\">(<a href="
@@ -1608,7 +1628,7 @@
 "i>)? <span class=\"anchor-reference-id\">(<a href=\"#long1\">#long1</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The name &ldquo;GNU&rdquo; does not visibly appear in &ldquo;Glinux,&rdquo; "
 "so most people would not notice it is there.  Even if it is capitalized as "
@@ -1621,7 +1641,7 @@
 "würden die meisten Menschen nicht erkennen, dass ein Verweis auf <i>GNU</i> "
 "vorhanden ist."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be comparable to writing &ldquo;GNU/Linux,&rdquo; but putting "
 "&ldquo;GNU/&rdquo; in print so small that most people could not read it."
@@ -1629,7 +1649,7 @@
 "Es wäre damit vergleichbar, <i>GNU/Linux</i> zu schreiben, aber <i>GNU/</i> "
 "in Druckform so klein zu setzen, dass die meisten es nicht lesen könnten."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  Why should "
 "I go to the trouble of saying &ldquo;GNU/&rdquo;? <span class=\"anchor-"
@@ -1640,7 +1660,7 @@
 "\"anchor-reference-id\">(<a href=\"#long2\">#long</a>)</span>"
 
 # en: sprich "GNU Slash"
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
 "the system that we developed, can't you take one second to recognize our "
@@ -1652,7 +1672,7 @@
 "weiß, kann man sich da nicht eine Sekunde nehmen, um unsere Arbeit "
 "anzuerkennen?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Unfortunately, &ldquo;GNU/Linux&rdquo; is five syllables. People won't use "
 "such a long term. Shouldn't you find a shorter one? <span class=\"anchor-"
@@ -1668,7 +1688,7 @@
 # (even if a combination with 'and' or 'or')
 #
 # [<a class="phonetics" title="Aussprache" href="/gnu/pronunciation">ˈgnuː 
slæʃ ˈliːnʊks</a>]
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, &ldquo;GNU/Linux&rdquo; is only four syllables.  &ldquo;"
 "Unfortunately&rdquo; is five syllables, yet people show no sign of "
@@ -1681,7 +1701,7 @@
 "wird kein Anzeichen des Widerwillens gezeigt, dieses Wort trotzdem zu "
 "verwenden."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-How about calling-]{+Stallman doesn't ask us to call him &ldquo;Richard
 # | Matthew Stallman&rdquo; every+} the [-system &ldquo;GliNUx&rdquo; (instead
 # | of &ldquo;GNU/Linux&rdquo;)?-] {+time.  So why ask us to say
@@ -1702,21 +1722,21 @@
 "i>)? <span class=\"anchor-reference-id\">(<a href=\"#long1\">#long1</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Omitting &ldquo;Matthew&rdquo; does not misrepresent anything important "
 "about Stallman's nature, origin, ideas or purpose.  Omitting &ldquo;"
 "GNU&rdquo; does misrepresent those things about the GNU/Linux system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is an example of a frequent way of hiding a fallacy: to bury it inside "
 "a misleading analogy.  A better analogy would be, &ldquo;Why shouldn't we "
 "call Stallman &lsquo;Torvalds&rsquo;?&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since Linux is a secondary contribution, would it be false to the facts to "
 "call the system simply &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id"
@@ -1727,7 +1747,7 @@
 "href=\"#justgnu\">#justgnu</a>)</span>"
 
 # [<a class="phonetics" title="Aussprache" href="/gnu/pronunciation">ˈgnuː 
slæʃ ˈliːnʊks</a>]
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would not be false to the facts, but it is not the best thing to do.  "
 "Here are the reasons we call that system version &ldquo;GNU/Linux&rdquo; "
@@ -1737,7 +1757,7 @@
 "Aus folgenden Gründen nennen wir das System <b>GNU/Linux</b> und nicht nur "
 "<em>GNU</em>:"
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It's not exactly GNU&mdash;it has a different kernel (that is, Linux).  "
 "Distinguishing GNU/Linux from GNU is useful."
@@ -1745,7 +1765,7 @@
 "Es ist nicht genau GNU&#160;&#8209;&#160;es hat einen anderen Systemkern "
 "(nämlich Linux). GNU/Linux von GNU zu unterscheiden ist sinnvoll."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It would be ungentlemanly to ask people to <em>stop</em> giving any credit "
 "to Linus Torvalds.  He did write an important component of the system.  We "
@@ -1765,7 +1785,7 @@
 "dieser Meinungsverschiedenheit ehrlich und offen um, anstatt zu versuchen, "
 "seinen Beitrag zum System nicht anzuerkennen."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
 "&ldquo;GNU&rdquo; they may simply not recognize we're talking about the same "
@@ -1777,7 +1797,7 @@
 "System reden. Sagen wir <b>GNU/Linux</b>, können sie einen Zusammenhang dazu 
"
 "herstellen, worüber sie gehört haben."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "I would have to pay a fee if I use &ldquo;Linux&rdquo; in the name of a "
 "product, and that would also apply if I say &ldquo;GNU/Linux&rdquo;.  Is it "
@@ -1791,7 +1811,7 @@
 "sparen? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There's nothing wrong in calling the system &ldquo;GNU&rdquo;; basically, "
 "that's what it is.  It is nice to give Linus Torvalds a share of the credit "
@@ -1801,7 +1821,7 @@
 "es das. Es ist nett Linus Torvalds auch einen Teil der Anerkennung zukommen "
 "zu lassen, aber man ist dazu nicht verpflichtet."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "So if you want to refer to the system simply as &ldquo;GNU&rdquo;, to avoid "
 "paying the fee for calling it &ldquo;Linux&rdquo;, we won't criticize you."
@@ -1810,7 +1830,7 @@
 "die Gebühr für den Namen <em>Linux</em> nicht zahlen zu müssen, werden wir 
"
 "dies nicht kritisieren."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today; it includes "
 "TeX, X11, Apache, Perl, and many more programs.  Don't your arguments imply "
@@ -1824,7 +1844,7 @@
 "absurd langen Namen führen würde)? <span class=\"anchor-reference-id\">(<a "
 "href=\"#many\">#many</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "What we say is that you ought to give the system's principal developer a "
 "share of the credit.  The principal developer is the GNU Project, and the "
@@ -1834,7 +1854,7 @@
 "der Anerkennung geben. Der Hauptentwickler ist das GNU-Projekt, und das "
 "System ist grundsätzlich GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you feel even more strongly about giving credit where it is due, you "
 "might feel that some secondary contributors also deserve credit in the "
@@ -1851,7 +1871,7 @@
 "glauben, dass Perl geradezu nach Erwähnung schreit und es <em>GNU/Linux/"
 "Perl</em> schreiben möchten, nur zu."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Since a long name such as GNU/X11/Apache/Linux/TeX/Perl/Python/FreeCiv "
 "becomes absurd, at some point you will have to set a threshold and omit the "
@@ -1865,7 +1885,7 @@
 "weglassen. Es gibt keine eindeutig richtige Grenze, aber, wo auch immer, wir "
 "sprechen uns nicht dagegen aus."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Different threshold levels would lead to different choices of name for the "
 "system.  But one name that cannot result from concerns of fairness and "
@@ -1879,7 +1899,7 @@
 "fair sein, die ganze Anerkennung einem sekundären Beitrag (Linux) zu geben, "
 "während der Hauptbeitrag (GNU) weggelassen wird."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Many companies contributed to-]{+systemd plays an important role in+}
 # | the {+GNU/Linux+} system as it is today; [-doesn't that mean-] {+are+} we
 # | [-ought-] {+obligated+} to call it [-GNU/Red&nbsp;Hat/Novell/Linux?-]
@@ -1902,7 +1922,7 @@
 "\"anchor-reference-id\">(<a href=\"#manycompanies\">#manycompanies</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "systemd is a fairly important component, but not as important as the kernel "
 "(Linux), nor as important as the basis of the system as a whole (GNU).  "
@@ -1910,7 +1930,7 @@
 "system &ldquo;GNU/systemd/Linux&rdquo;, there is nothing wrong with doing so."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today, but they don't "
 "insist on calling it XYZ/Linux.  Why should we treat GNU specially? <span "
@@ -1921,7 +1941,7 @@
 "b> besonders behandelt werden? <span class=\"anchor-reference-id\">(<a href="
 "\"#others\">#others</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Thousands of projects have developed programs commonly included in today's "
 "GNU/Linux systems.  They all deserve credit for their contributions, but "
@@ -1933,7 +1953,7 @@
 "sie sind nicht die Hauptentwickler des Systems als Ganzes, sodass sie nicht "
 "bitten als solche anerkannt zu werden."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is different because it is more than just a contributed program, more "
 "than just a collection of contributed programs.  GNU is the framework on "
@@ -1943,7 +1963,7 @@
 "als nur eine Sammlung beigetragener Programme. GNU ist der Rahmen, worauf "
 "das System aufbaut."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "GNU is a small fraction of the system nowadays, so why should we mention it? "
 "<span class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</"
@@ -1953,7 +1973,7 @@
 "es erwähnen? <span class=\"anchor-reference-id\">(<a href=\"#allsmall"
 "\">#allsmall</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In 2008, we found that GNU packages made up 15% of the &ldquo;main&rdquo; "
 "repository of the gNewSense GNU/Linux distribution.  Linux made up 1.5%.  So "
@@ -1965,7 +1985,7 @@
 "ausmachten. Linux machte 1,5&#160;% aus. Folglich würde dasselbe Argument "
 "noch viel stärker auf die Benennung von <em>Linux</em> zutreffen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is a small fraction of the system nowadays, and Linux is an even smaller "
 "fraction.  But they are the system's core; the system was made by combining "
@@ -1976,7 +1996,7 @@
 "Kombination beider geschaffen. Dadurch ist der Name <strong>GNU/Linux</"
 "strong> weiterhin angebracht."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many companies contributed to the system as it is today; doesn't that mean "
 "we ought to call it GNU/Red&nbsp;Hat/Novell/Linux? <span class=\"anchor-"
@@ -1987,7 +2007,7 @@
 "\"anchor-reference-id\">(<a href=\"#manycompanies\">#manycompanies</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is not comparable to Red Hat or Novell; it is not a company, or an "
 "organization, or even an activity.  GNU is an operating system.  (When we "
@@ -2001,7 +2021,7 @@
 "<em>GNU-System</em> zu entwickeln). Das GNU/Linux-System beruht auf GNU, und "
 "darum sollte GNU im Namen erscheinen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Much of those companies' contribution to the GNU/Linux system lies in the "
 "code they have contributed to various GNU packages including GCC and GNOME.  "
@@ -2013,7 +2033,7 @@
 "und <em>GNOME</em>, beigetragen haben. <em><b>GNU/Linux</b></em> zu sagen, "
 "gibt jenen Unternehmen sowie allen anderen GNU-Entwicklern Anerkennung."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
@@ -2022,7 +2042,7 @@
 "Warum <em><b>GNU/Linux</b></em> statt <em>‚GNU Linux‘</em> schreiben? 
<span "
 "class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean "
@@ -2035,7 +2055,7 @@
 "Paket ist</em> bedeuten. Keine dieser Bedeutungen passt ansatzweise zur "
 "vorhandenen Situation."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is not a GNU package; that is, it wasn't developed under the GNU "
 "Project's aegis or contributed specifically to the GNU Project.  Linus "
@@ -2048,14 +2068,32 @@
 "Deswegen ist die Bedeutung <em>Linux, das ein GNU-Paket ist</em> nicht "
 "richtig."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | We're not talking about a distinct GNU version of Linux, the kernel.  The
+# | free GNU/Linux distros do have a <a
+# | [-href=\"http://directory.fsf.org/project/linux\";>separate-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>separate+} version
+# | of Linux</a>, since the &ldquo;standard&rdquo; version contains
+# | non[---]free firmware &ldquo;blobs&rdquo;.  If this were part of the GNU
+# | Project, it could be considered &ldquo;GNU Linux&rdquo;; but we would not
+# | want to call it that, because it would be too confusing.
+#, fuzzy
+#| msgid ""
+#| "We're not talking about a distinct GNU version of Linux, the kernel.  The "
+#| "free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/";
+#| "project/linux\">separate version of Linux</a>, since the &ldquo;"
+#| "standard&rdquo; version contains non-free firmware &ldquo;blobs&rdquo;.  "
+#| "If this were part of the GNU Project, it could be considered &ldquo;GNU "
+#| "Linux&rdquo;; but we would not want to call it that, because it would be "
+#| "too confusing."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
-"free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/project/";
-"linux\">separate version of Linux</a>, since the &ldquo;standard&rdquo; "
-"version contains non-free firmware &ldquo;blobs&rdquo;.  If this were part "
-"of the GNU Project, it could be considered &ldquo;GNU Linux&rdquo;; but we "
-"would not want to call it that, because it would be too confusing."
+"free GNU/Linux distros do have a <a href=\"https://directory.fsf.org/wiki/";
+"Linux-libre\">separate version of Linux</a>, since the &ldquo;"
+"standard&rdquo; version contains nonfree firmware &ldquo;blobs&rdquo;.  If "
+"this were part of the GNU Project, it could be considered &ldquo;GNU "
+"Linux&rdquo;; but we would not want to call it that, because it would be too "
+"confusing."
 msgstr ""
 "Wir reden hier nicht von einer eigenständigen GNU-Variante von Linux, dem "
 "Betriebssystemkern. Freie GNU/Linux-Distributionen  haben eine <a href="
@@ -2066,7 +2104,7 @@
 "werden; wir würden es aber nicht so nennen wollen, weil es zu irritierend "
 "wäre."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We're talking about a version of GNU, the operating system, distinguished by "
 "having Linux as the kernel.  A slash fits the situation because it means "
@@ -2079,7 +2117,7 @@
 "System ist die Verbindung von GNU und Linux, daher <strong>GNU/Linux</"
 "strong>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are other ways to express &ldquo;combination&rdquo;.  If you think "
 "that a plus-sign is clearer, please use that.  In French, a hyphen is clear: "
@@ -2092,7 +2130,7 @@
 "\"es\">GNU-Linux</span></em>. Auf Spanisch auch <em><span xml:lang=\"es\" "
 "lang=\"es\">GNU con Linux</span></em>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Should we say &ldquo;GNU/BSD&rdquo; too?-]{+How is the name
 # | &ldquo;GNU/Linux&rdquo; pronounced?+} <span
 # | class=\"anchor-reference-id\">(<a [-href=\"#bsd\">#bsd</a>)</span>-]
@@ -2108,14 +2146,14 @@
 "Sollte auch <em>GNU/BSD</em> gesagt werden? <span class=\"anchor-reference-id"
 "\">(<a href=\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please pronounce it as &ldquo;GNU slash Linux.&rdquo; If you don't pronounce "
 "the slash, people will think you are saying &ldquo;GNU Linux,&rdquo; which "
 "is <a href=\"#whyslash\">not a suitable name for the combination</a>."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | Why do you write [-&ldquo;GNU/Linux&rdquo; instead of-] &ldquo;GNU
 # | [-Linux&rdquo;?-] {+Emacs&rdquo; rather than &ldquo;GNU/Emacs&rdquo;?+}
 # | <span class=\"anchor-reference-id\">(<a
@@ -2134,7 +2172,7 @@
 "Warum <em><b>GNU/Linux</b></em> statt <em>‚GNU Linux‘</em> schreiben? 
<span "
 "class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 # | Following the rules of English, in the construction &ldquo;GNU
 # | [-Linux&rdquo;-] {+Emacs&rdquo;+} the word &ldquo;GNU&rdquo; modifies
 # | [-&ldquo;Linux&rdquo;.  This can mean either &ldquo;GNU's version of
@@ -2159,14 +2197,14 @@
 "Paket ist</em> bedeuten. Keine dieser Bedeutungen passt ansatzweise zur "
 "vorhandenen Situation."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;GNU/Emacs&rdquo; would mean the combination of GNU, the operating "
 "system, and the program Emacs.  That doesn't fit this program, so &ldquo;GNU/"
 "Emacs&rdquo; is the wrong way to refer to it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why &ldquo;GNU/Linux&rdquo; rather than &ldquo;Linux/GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
@@ -2174,7 +2212,7 @@
 "Warum <b>GNU/Linux</b> anstatt <em>Linux/GNU</em>? <span class=\"anchor-"
 "reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is right and proper to mention the principal contribution first.  The GNU "
 "contribution to the system is not only bigger than Linux and prior to Linux, "
@@ -2184,7 +2222,7 @@
 "Beitrag von GNU zum System ist nicht nur größer als und startete vor Linux, 
"
 "tatsächlich haben wir die Aktivität insgesamt erst ins Leben gerufen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the lowest "
 "level of the system and GNU fills technically higher levels."
@@ -2193,7 +2231,7 @@
 "<em>GNU/Linux</em>-Systems ist, <em>GNU</em> die technisch höheren Ebenen "
 "erfüllt."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
 "lot better than what people usually do, which is to omit GNU entirely and "
@@ -2203,7 +2241,7 @@
 "viel besser als das, was viele üblicherweise tun, nämlich GNU vollständig "
 "weglassen und den Anschein erwecken, das Gesamtsystem sei 
<em>„Linux“</em>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
 "say anything about what the system consists of.  Why shouldn't they call it "
@@ -2215,7 +2253,7 @@
 "nicht benennen dürfen wie auch immer sie mögen? <span class=\"anchor-"
 "reference-id\">(<a href=\"#distronames\">#distronames0</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling a system &ldquo;Foobar Linux&rdquo; implies that it's a flavor of "
 "&ldquo;Linux,&rdquo; and people <a href=\"#distronames\">understand it that "
@@ -2225,7 +2263,7 @@
 "Variante von <em>„Linux“</em> ist, und <a href=\"#distronames\">so wird 
es "
 "auch verstanden</a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If they called a GNU/Linux distro &ldquo;Foobar BSD,&rdquo; you would call "
 "that a mistake.  &ldquo;This system is not BSD,&rdquo; you would tell them.  "
@@ -2235,7 +2273,7 @@
 "würde man das einen Fehler nennen. <em>„Dieses System ist nicht 
BSD!“</em>, "
 "würde man ihnen sagen. Nun, Linux ist es auch nicht. "
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro is called &ldquo;Foobar Linux&rdquo;; doesn't that show it's "
 "really Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
@@ -2245,7 +2283,7 @@
 "ausgedrückt, dass es wirklich Linux ist? <span 
class=\"anchor-reference-id\">"
 "(<a href=\"#distronames\">#distronames</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It means that the people who make the &ldquo;Foobar Linux&rdquo; distro are "
 "repeating the common mistake. We appreciate that distributions like Debian, "
@@ -2261,7 +2299,7 @@
 "anderen Distributionen involviert sein, dazu zu ermutigen, das gleiche zu "
 "tun."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's official name is &ldquo;Foobar Linux&rdquo;; isn't it wrong to "
 "call the distro anything but &ldquo;Foobar Linux&rdquo;? <span class="
@@ -2272,7 +2310,7 @@
 "nennen? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames1\">#distronames1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When they spread misinformation by changing &ldquo;GNU&rdquo; to &ldquo;"
 "Linux&rdquo;, and call their version of it &ldquo;Foobar Linux&rdquo;, it's "
@@ -2284,7 +2322,7 @@
 "wäre es angemessen die Fehlinformation dadurch zu korrigieren, dass man es "
 "<em>Fubar GNU/Linux</em> nennt."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be more effective to ask companies such as Mandrake, Red Hat and "
 "IBM to call their distributions &ldquo;GNU/Linux&rdquo; rather than asking "
@@ -2296,7 +2334,7 @@
 "Einzelne darum zu bitten? <span class=\"anchor-reference-id\">(<a href="
 "\"#companies\">#companies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It isn't a choice of one or the other&mdash;we ask companies and "
 "organizations and individuals to help spread the word about this.  In fact, "
@@ -2315,7 +2353,7 @@
 "zu verdienen, wenn wir es „Linux“ nennen.“ Mit anderen Worten, dieses "
 "Unternehmen interessierte sich nicht dafür, was richtig war."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We can't make them do this right, but we're not the sort to give up just "
 "because the road isn't easy.  You may not have as much influence at your "
@@ -2330,7 +2368,7 @@
 "an dem Unternehmen mehr Gewinn machen, indem sie es <strong>GNU/Linux</"
 "strong> nennen."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to reserve the name &ldquo;GNU/Linux&rdquo; for "
 "distributions that are purely free software? After all, that is the ideal of "
@@ -2342,15 +2380,35 @@
 "das Ideal von GNU. <span class=\"anchor-reference-id\">(<a href=\"#reserve"
 "\">#reserve</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+# | The widespread practice of adding non[---]free software to the GNU/Linux
+# | system is a major problem for our community.  It teaches the users that
+# | non[---]free software is ok, and that using it is part of the spirit of
+# | &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of
+# | their mission to help users use non[---]free add-ons, and may even invite
+# | salesmen to come and make sales pitches for them.  They adopt goals such
+# | as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them
+# | use non[---]free applications and drivers), or making the system more
+# | popular even at the cost of freedom.
+#, fuzzy
+#| msgid ""
+#| "The widespread practice of adding non-free software to the GNU/Linux "
+#| "system is a major problem for our community.  It teaches the users that "
+#| "non-free software is ok, and that using it is part of the spirit of "
+#| "&ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part "
+#| "of their mission to help users use non-free add-ons, and may even invite "
+#| "salesmen to come and make sales pitches for them.  They adopt goals such "
+#| "as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them "
+#| "use non-free applications and drivers), or making the system more popular "
+#| "even at the cost of freedom."
 msgid ""
-"The widespread practice of adding non-free software to the GNU/Linux system "
-"is a major problem for our community.  It teaches the users that non-free "
+"The widespread practice of adding nonfree software to the GNU/Linux system "
+"is a major problem for our community.  It teaches the users that nonfree "
 "software is ok, and that using it is part of the spirit of &ldquo;"
 "Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of their "
-"mission to help users use non-free add-ons, and may even invite salesmen to "
+"mission to help users use nonfree add-ons, and may even invite salesmen to "
 "come and make sales pitches for them.  They adopt goals such as &ldquo;"
-"helping the users&rdquo; of GNU/Linux (including helping them use non-free "
+"helping the users&rdquo; of GNU/Linux (including helping them use nonfree "
 "applications and drivers), or making the system more popular even at the "
 "cost of freedom."
 msgstr ""
@@ -2365,12 +2423,12 @@
 "benutzen) oder das System sogar populärer zu machen&#160;&#8209;&#160;auf "
 "Kosten der Freiheit."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The question is how to try to change this."
 msgstr "Die Frage ist, wie man versuchen kann, das zu ändern."
 
 #
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Given that most of the community which uses GNU with Linux already does not "
 "realize that's what it is, for us to disown these adulterated versions, "
@@ -2386,13 +2444,29 @@
 "nur antworten sie hätten niemals gedacht, dass diese Systeme in erster Linie 
"
 "GNU wären."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The way to lead these users to see a connection with freedom is exactly
+# | the opposite: to inform them that all these system versions <em>are</em>
+# | versions of GNU, that they all are based on a system that exists
+# | specifically for the sake of the users' freedom.  With this understanding,
+# | they can start to recognize the distributions that include non[---]free
+# | software as perverted, adulterated versions of GNU, instead of thinking
+# | they are proper and appropriate &ldquo;versions of Linux&rdquo;.
+#, fuzzy
+#| msgid ""
+#| "The way to lead these users to see a connection with freedom is exactly "
+#| "the opposite: to inform them that all these system versions <em>are</em> "
+#| "versions of GNU, that they all are based on a system that exists "
+#| "specifically for the sake of the users' freedom.  With this "
+#| "understanding, they can start to recognize the distributions that include "
+#| "non-free software as perverted, adulterated versions of GNU, instead of "
+#| "thinking they are proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgid ""
 "The way to lead these users to see a connection with freedom is exactly the "
 "opposite: to inform them that all these system versions <em>are</em> "
 "versions of GNU, that they all are based on a system that exists "
 "specifically for the sake of the users' freedom.  With this understanding, "
-"they can start to recognize the distributions that include non-free software "
+"they can start to recognize the distributions that include nonfree software "
 "as perverted, adulterated versions of GNU, instead of thinking they are "
 "proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgstr ""
@@ -2405,7 +2479,7 @@
 "umfassen, anstatt anzunehmen sie seien richtige und angemessene <em>„Linux-"
 "Versionen“</em>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is very useful to start GNU/Linux User Groups, which call the system GNU/"
 "Linux and adopt the ideals of the GNU Project as a basis for their "
@@ -2424,7 +2498,7 @@
 "sich auf die oberflächlicheren Ziele konzentrieren, haben ein Recht auf ihre 
"
 "Ansichten, aber lassen Sie sich nicht mitreißen!"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not make a GNU distribution of Linux (sic) and call that GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
@@ -2434,7 +2508,7 @@
 "<b>GNU/Linux</b> genannt? <span class=\"anchor-reference-id\">(<a href="
 "\"#gnudist\">#gnudist</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "All the &ldquo;Linux&rdquo; distributions are actually versions of the GNU "
 "system with Linux as the kernel.  The purpose of the term &ldquo;GNU/"
@@ -2448,7 +2522,7 @@
 "entwickeln und diese allein <b>GNU/Linux</b> zu nennen, würde diesen Punkt "
 "schwer verständlich machen, auf den es uns ankommt."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "As for developing a distribution of GNU/Linux, we already did this once, "
 "when we funded the early development of Debian GNU/Linux.  To do it again "
@@ -2462,7 +2536,7 @@
 "viel Arbeit und, sofern die neue Distribution keine wesentlichen praktischen "
 "Vorteile gegenüber anderen Distributionen hätte, keinen Zweck dienen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Instead we help the developers of 100% free GNU/Linux distributions, such as "
 "gNewSense and Ututo."
@@ -2470,7 +2544,7 @@
 "Stattdessen helfen wir Entwicklern von 100&#160;% freien GNU/Linux-"
 "Distributionen wie gNewSense und Ututo."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not just say &ldquo;Linux is the GNU kernel&rdquo; and release some "
 "existing version of GNU/Linux under the name &ldquo;GNU&rdquo;? <span class="
@@ -2481,7 +2555,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#linuxgnu\">#linuxgnu</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It might have been a good idea to adopt Linux as the GNU kernel back in "
 "1992.  If we had realized, then, how long it would take to get the GNU Hurd "
@@ -2492,7 +2566,7 @@
 "GNU&#160;Hurd zum Laufen zu bringen, dann hätten wir das tun können (leider 
"
 "ist das nachträgliche Einsicht)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we were to take an existing version of GNU/Linux and relabel it as &ldquo;"
 "GNU&rdquo;, that would be somewhat like making a version of the GNU system "
@@ -2504,7 +2578,7 @@
 "herzustellen und als <em>„Linux“</em> zu bezeichnen. Das war nicht 
richtig, "
 "und wir möchten nicht so handeln."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Did the GNU Project condemn and oppose use of Linux in the early days? <span "
 "class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
@@ -2513,7 +2587,7 @@
 "sich dagegen ausgesprochen? <span class=\"anchor-reference-id\">(<a href="
 "\"#condemn\">#condemn</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We did not adopt Linux as our kernel, but we didn't condemn or oppose it.  "
 "In 1993 we started discussing the arrangements to sponsor the development of "
@@ -2533,7 +2607,7 @@
 "spontan und nicht portierbar; sie mussten noch für eine Installation "
 "bereinigt werden."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who had made the changes showed little interest in cooperating "
 "with us.  One of them actually told us that he didn't care about working "
@@ -2553,7 +2627,7 @@
 "praktisch immer noch der einzige) Personenkreis, der nicht bereit war, mit "
 "uns zu arbeiten."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It was this experience that first showed us that people were calling a "
 "version of the GNU system &ldquo;Linux&rdquo;, and that this confusion was "
@@ -2567,7 +2641,7 @@
 "strong> zu nennen, ist unsere Antwort auf dieses Problem und auf die anderen "
 "durch die falsche Bezeichnung <em>„Linux“</em> verursachten Probleme."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why did you wait so long before asking people to use the name GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
@@ -2576,7 +2650,7 @@
 "Linux</b> zu verwenden? <span class=\"anchor-reference-id\">(<a href=\"#wait"
 "\">#wait</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually we didn't.  We began talking privately with developers and "
 "distributors about this in 1994, and made a more public campaign in 1996.  "
@@ -2587,7 +2661,7 @@
 "öffentlichere Kampagne durch. Wir werden solange weitermachen, solange es "
 "notwendig ist."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should the GNU/<i>name</i> convention be applied to all programs that are "
 "GPL'ed? <span class=\"anchor-reference-id\">(<a href=\"#allgpled"
@@ -2597,7 +2671,7 @@
 "angewendet werden? <span class=\"anchor-reference-id\">(<a href=\"#allgpled"
 "\">#allgpled</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We never refer to individual programs as &ldquo;GNU/<i>name</i>&rdquo;.  "
 "When a program is a GNU package, we may call it &ldquo;GNU <i>name</"
@@ -2606,7 +2680,7 @@
 "Wir nennen niemals einzelne Programme <em>GNU/[Name]</em>. Ist ein Programm "
 "ein GNU-Paket, können wir es <em>GNU [Name]</em> nennen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU, the operating system, is made up of many different programs.  Some of "
 "the programs in GNU were written as part of the GNU Project or specifically "
@@ -2618,7 +2692,7 @@
 "geschrieben oder ausdrücklich dazu beigetragen; das sind die GNU-Pakete, und 
"
 "wir verwenden in deren Namen häufig <em>GNU</em>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It's up to the developers of a program to decide if they want to contribute "
 "it and make it a GNU package.  If you have developed a program and you would "
@@ -2632,7 +2706,7 @@
 "<a href=\"mailto:gnu@gnu.org\";>&lt;gnu@gnu.org&gt;</a>, damit wir es "
 "bewerten und entscheiden können, ob wir es wollen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It wouldn't be fair to put the name GNU on every individual program that is "
 "released under the GPL.  If you write a program and release it under the "
@@ -2652,7 +2726,7 @@
 "Arbeit unabhängig. Wenn etwas kein GNU-Paket ist, kann das GNU-Projekt 
dafür "
 "keine Anerkennung bekommen und ein <em>GNU</em> im Namen wäre unangemessen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In contrast, we do deserve the overall credit for the GNU operating system "
 "as a whole, even though not for each and every program in it.  The system "
@@ -2665,7 +2739,7 @@
 "Beharrlichkeit, beginnend im Jahr 1984, viele Jahre bevor Linux begonnen "
 "wurde."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The operating system in which Linux became popular was basically the same as "
 "the GNU operating system.  It was not entirely the same, because it had a "
@@ -2677,7 +2751,7 @@
 "einen anderen Betriebssystemkern hatte, aber größtenteils war es das 
gleiche "
 "System. Es war eine Variante von GNU. Es war das GNU/Linux-System."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux continues to be used primarily in derivatives of that system&mdash;in "
 "today's versions of the GNU/Linux system.  What gives these systems their "
@@ -2689,7 +2763,7 @@
 "Was diesen Systemen ihre Identität verleiht, sind GNU und Linux im "
 "Mittelpunkt dieser Systeme, nicht vor allem Linux allein."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since much of GNU comes from Unix, shouldn't GNU give credit to Unix by "
 "using &ldquo;Unix&rdquo; in its name? <span class=\"anchor-reference-id\">"
@@ -2699,7 +2773,7 @@
 "mithilfe von <em>Unix</em> im Namen geben? <span class=\"anchor-reference-id"
 "\">(<a href=\"#unix\">#unix</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Actually, none of GNU comes from Unix.  Unix was proprietary software (and "
 "still is), so using any of its code in GNU would have been illegal.  This is "
@@ -2716,7 +2790,7 @@
 "freies System, um es zu ersetzen. Wir konnten keine Programme von Unix "
 "kopieren, nicht einmal Teile davon; alles musste neu geschrieben werden."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "No code in GNU comes from Unix, but GNU is a Unix-compatible system; "
 "therefore, many of the ideas and specifications of GNU do come from Unix.  "
@@ -2730,13 +2804,29 @@
 "humorvolle Art der Danksagung an Unix und folgt einer Hackertradition von "
 "rekursiven Akronymen, die in den 70ern begannen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.
+# |  The author of TINT wrote another implementation of TECO (there were
+# | already many of them, for various systems), but instead of calling it by a
+# | dull name like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of
+# | a clever amusing name.  (That's what hacking means: <a
+# | href=\"http{+s+}://stallman.org/articles/on-hacking.html\">playful
+# | cleverness</a>.)
+#, fuzzy
+#| msgid ""
+#| "The first such recursive acronym was TINT, &ldquo;TINT Is Not "
+#| "TECO&rdquo;.  The author of TINT wrote another implementation of TECO "
+#| "(there were already many of them, for various systems), but instead of "
+#| "calling it by a dull name like &ldquo;<em>somethingorother</em> "
+#| "TECO&rdquo;, he thought of a clever amusing name.  (That's what hacking "
+#| "means: <a href=\"http://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
 "The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
 "The author of TINT wrote another implementation of TECO (there were already "
 "many of them, for various systems), but instead of calling it by a dull name "
 "like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of a clever "
-"amusing name.  (That's what hacking means: <a href=\"http://stallman.org/";
+"amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
 "Das erste derartige rekursive Akronym war <abbr title=\"TINT Is Not TECO\" "
@@ -2747,7 +2837,7 @@
 "amüsanten Namen (genau das, was Hacken bedeutet: <a href=\"http://stallman.";
 "org/articles/on-hacking.html\">spielerische Klugheit</a>)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Other hackers enjoyed that name so much that we imitated the approach.  It "
 "became a tradition that, when you were writing from scratch a program that "
@@ -2763,7 +2853,7 @@
 "geben, wie <em>MINK</em> für <em>MINK Ist Nicht Klever</em>. In diesem Geist 
"
 "nannten wir unseren Ersatz für Unix <em>GNU&#8217; Nicht Unix</em>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Historically, AT&amp;T which developed Unix did not want anyone to give it "
 "credit by using &ldquo;Unix&rdquo; in the name of a similar system, not even "
@@ -2780,7 +2870,7 @@
 "der verschiedenen modifizierten Versionen von Unix (alle proprietären, wie "
 "Unix) einen völlig anderen Namen hatten, der nicht <em>Unix</em> einschloss."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we say &ldquo;GNU/BSD&rdquo; too? <span class=\"anchor-reference-id\">"
 "(<a href=\"#bsd\">#bsd</a>)</span>"
@@ -2788,7 +2878,7 @@
 "Sollte auch <em>GNU/BSD</em> gesagt werden? <span class=\"anchor-reference-id"
 "\">(<a href=\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems, "
 "because that term does not fit the history of the BSD systems."
@@ -2796,9 +2886,19 @@
 "Wir nennen die BSD-Systeme (FreeBSD usw.) nicht <em>GNU/BSD</em>-Systeme, "
 "weil dieser Begriff nicht zur Geschichte der BSD-Systeme passt."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The BSD system was developed by UC Berkeley as non[---]free software in
+# | the 80s, and became free in the early 90s.  A free operating system that
+# | exists today is almost certainly either a variant of the GNU system, or a
+# | kind of BSD system.
+#, fuzzy
+#| msgid ""
+#| "The BSD system was developed by UC Berkeley as non-free software in the "
+#| "80s, and became free in the early 90s.  A free operating system that "
+#| "exists today is almost certainly either a variant of the GNU system, or a "
+#| "kind of BSD system."
 msgid ""
-"The BSD system was developed by UC Berkeley as non-free software in the 80s, "
+"The BSD system was developed by UC Berkeley as nonfree software in the 80s, "
 "and became free in the early 90s.  A free operating system that exists today "
 "is almost certainly either a variant of the GNU system, or a kind of BSD "
 "system."
@@ -2809,7 +2909,7 @@
 "freies Betriebssystem ist nahezu sicher entweder eine Variante des GNU-"
 "Systems oder eine Art BSD-System."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "People sometimes ask whether BSD too is a variant of GNU, as GNU/Linux is.  "
 "It is not.  The BSD developers were inspired to make their code free "
@@ -2823,7 +2923,7 @@
 "explizite Appelle von GNU-Aktivisten halfen sie davon zu überzeugen zu "
 "beginnen, aber der Quellcode hatte nur wenig Gemeinsamkeiten mit GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "BSD systems today use some GNU packages, just as the GNU system and its "
 "variants use some BSD programs; however, taken as wholes, they are two "
@@ -2838,7 +2938,7 @@
 "fügten ihn dem GNU-System hinzu, daher würde ein Name wie GNU/BSD der "
 "Situation nicht gerecht werden."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The connection between GNU/Linux and GNU is much closer, and that's why the "
 "name &ldquo;GNU/Linux&rdquo; is appropriate for it."
@@ -2846,7 +2946,7 @@
 "Der Zusammenhang zwischen GNU/Linux und GNU ist viel enger, und deshalb auch "
 "der Name <b>GNU/Linux</b> angemessen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is a version of GNU which uses the kernel from NetBSD.  Its developers "
 "call it &ldquo;Debian GNU/NetBSD&rdquo;, but &ldquo;GNU/"
@@ -2860,7 +2960,7 @@
 "System ist, nicht nur der Systemkern. Das ist kein BSD-System, da das meiste "
 "des Systems dem GNU/Linux-System gleicht."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "If I install the GNU tools on Windows, does that mean I am running a GNU/"
 "Windows system? <span class=\"anchor-reference-id\">(<a href=\"#othersys"
@@ -2871,7 +2971,7 @@
 "href=\"#othersys\">#othersys</a>)</span>"
 
 # …situation _than_ from GNU/Linux.
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
 "GNU are just a part of the GNU software, which is just a part of the GNU "
@@ -2885,7 +2985,7 @@
 "komplettes Betriebssystem haben, das keinen Quellode mit GNU gemein hat. "
 "Alles in allem ist das eine ganz andere Situation als bei GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can't Linux be used without GNU? <span class=\"anchor-reference-id\">(<a "
 "href=\"#justlinux\">#justlinux</a>)</span>"
@@ -2893,7 +2993,7 @@
 "Kann Linux nicht ohne GNU verwendet werden? <span class=\"anchor-reference-id"
 "\">(<a href=\"#justlinux\">#justlinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is used by itself, or with small other programs, in some appliances.  "
 "These small software systems are a far cry from the GNU/Linux system.  Users "
@@ -2908,7 +3008,7 @@
 "dass diese Geräte ausschließlich Linux ausführen, um deutlich zu machen, 
wie "
 "verschieden diese kleinen Plattformen von GNU/Linux sind."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How much of the GNU system is needed for the system to be GNU/Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
@@ -2917,7 +3017,7 @@
 "sein? <span class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "&ldquo;How much&rdquo; is not a meaningful question because the GNU system "
 "does not have precise boundaries."
@@ -2925,7 +3025,7 @@
 "‚Wie viel‘ ist keine sinnvolle Frage, weil das GNU-System keine genaue "
 "Grenzen aufweist."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is an operating system maintained by a community.  It includes far more "
 "than just the GNU software packages (of which we have a specific list), and "
@@ -2942,7 +3042,7 @@
 "verwendet und einen Teil nicht, gibt es keine aussagekräftige Möglichkeit 
zu "
 "sagen, ‚wie viel‘ man verwendet."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we look at the level of packages, Linux is one important package in the "
 "GNU/Linux system.  The inclusion of one important GNU package is enough to "
@@ -2952,7 +3052,7 @@
 "GNU/Linux-System. Die Aufnahme von einem wesentlichen GNU-Paket ist "
 "ausreichend, um unserer Bitte nach gleicher Erwähnung zu rechtfertigen."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Are there complete Linux systems [sic] without GNU? <span class=\"anchor-"
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
@@ -2962,7 +3062,7 @@
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There are complete systems that contain Linux and not GNU; Android is an "
 "example.  But it is a mistake to call them &ldquo;Linux&rdquo; systems, just "
@@ -2973,7 +3073,7 @@
 "nennen, genauso wie es ein Fehler ist, GNU ein  <em>„Linux“</em>-System 
zu "
 "nennen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android is very different from the GNU/Linux system&mdash;because the two "
 "have very little code in common.  In fact, the only thing they have in "
@@ -2983,7 +3083,7 @@
 "die beiden sehr wenig Quellcode gemein haben. Tatsächlich ist das einzige, "
 "was sie gemein haben, ist Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
 "necessary to say things like, &ldquo;Android contains Linux, but it isn't "
@@ -2995,7 +3095,7 @@
 "es nicht Linux, weil es nicht die üblichen Linux [sic]-Bibliotheken und -"
 "Dienstprogramme [also das GNU-System] enthält.“</i>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android contains just as much of Linux as GNU/Linux does.  What it doesn't "
 "have is the GNU system.  Android replaces that with Google software that "
@@ -3007,7 +3107,7 @@
 "die ganz anders funktioniert. Was Android von GNU/Linux unterscheidet ist "
 "das Nichtvorhandensein von GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Is it correct to say &ldquo;using Linux&rdquo; if it refers to using GNU/"
 "Linux and using Android? <span class=\"anchor-reference-id\">(<a href="
@@ -3019,7 +3119,7 @@
 "\"#usegnulinuxandandroid\">#usegnulinuxandandroid</"
 "a><del>linuxsyswithoutgnu</del>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Far from it.  That usage is so strained that people will not understand the "
 "intended meaning."
@@ -3027,7 +3127,7 @@
 "Ganz und gar nicht. Diese Verwendung ist so vorbelastet, dass die eigentlich "
 "gemeinte Bedeutung nicht verstanden wird."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public will find it very strange to speak of using Android as &ldquo;"
 "using Linux&rdquo;.  It's like having a conversation, then saying you were "
@@ -3038,7 +3138,7 @@
 "führen und anschließend zu sagen, dass man sich mit den Eingeweiden oder 
dem "
 "Kreislaufsystem dieser Person unterhielt."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public <em>will</em> understand the idea of &ldquo;using Linux&rdquo; "
 "when it's really GNU/Linux, by way of the usual misunderstanding: thinking "
@@ -3049,7 +3149,7 @@
 "neben dem üblichen Missverständnis hinaus&#160;&#8209;&#160;verstehen: an "
 "das Gesamtsystem als „Linux“ denkend."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Use of Android and use of GNU/Linux are totally different, as different as "
 "driving a car and riding a bicycle.  The fact that the first two both "
@@ -3072,7 +3172,7 @@
 "einfachste Möglichkeit über GNU/Linux und Android zu sprechen, ist die "
 "Verwendung von <em>mit GNU/Linux und Android</em>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not call the system &ldquo;Linux&rdquo; anyway, and strengthen Linus "
 "Torvalds' role as posterboy for our community? <span class=\"anchor-"
@@ -3083,7 +3183,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#helplinus\">#helplinus</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Linus Torvalds is the &ldquo;posterboy&rdquo; (other people's choice of "
 "word, not ours) for his goals, not ours.  His goal is to make the system "
@@ -3102,12 +3202,30 @@
 "ethischen Grundsatz befürwortet, weshalb die Öffentlichkeit den Namen <em>"
 "„Linux“</em> nicht mit diesem Grundsatz verbindet."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | Linus publicly states his disagreement with the free software movement's
+# | ideals.  He developed non[---]free software in his job for many years (and
+# | said so to a large audience at a &ldquo;Linux&rdquo;World show), and
+# | publicly invited fellow developers of Linux, the kernel, to use
+# | non[---]free software to work on it with him.  He goes even further, and
+# | rebukes people who suggest that engineers and scientists should consider
+# | social consequences of our technical work&mdash;rejecting the lessons
+# | society learned from the development of the atom bomb.
+#, fuzzy
+#| msgid ""
+#| "Linus publicly states his disagreement with the free software movement's "
+#| "ideals.  He developed non-free software in his job for many years (and "
+#| "said so to a large audience at a &ldquo;Linux&rdquo;World show), and "
+#| "publicly invited fellow developers of Linux, the kernel, to use non-free "
+#| "software to work on it with him.  He goes even further, and rebukes "
+#| "people who suggest that engineers and scientists should consider social "
+#| "consequences of our technical work&mdash;rejecting the lessons society "
+#| "learned from the development of the atom bomb."
 msgid ""
 "Linus publicly states his disagreement with the free software movement's "
-"ideals.  He developed non-free software in his job for many years (and said "
+"ideals.  He developed nonfree software in his job for many years (and said "
 "so to a large audience at a &ldquo;Linux&rdquo;World show), and publicly "
-"invited fellow developers of Linux, the kernel, to use non-free software to "
+"invited fellow developers of Linux, the kernel, to use nonfree software to "
 "work on it with him.  He goes even further, and rebukes people who suggest "
 "that engineers and scientists should consider social consequences of our "
 "technical work&mdash;rejecting the lessons society learned from the "
@@ -3123,7 +3241,7 @@
 "Arbeit berücksichtigen sollten&#160;&#8209;&#160;weist die Lektionen 
zurück, "
 "die die Gesellschaft aus der Entwicklung der Atombombe lernte."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with writing a free program for the motivations of "
 "learning and having fun; the kernel Linus wrote for those reasons was an "
@@ -3144,7 +3262,7 @@
 "besagte Betriebssystem von Idealen der Freiheit stammt, nicht von seinen "
 "Ansichten."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong for us to label Linus Torvalds' work as GNU? <span class="
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
@@ -3153,7 +3271,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong, so we don't do that.  Torvalds' work is Linux, the "
 "kernel; we are careful not to attribute that work to the GNU Project or "
@@ -3166,7 +3284,7 @@
 "wir über das Gesamtsystems sprechen, gibt ihm der Name <strong>GNU/Linux</"
 "strong> einen Teil der Anerkennung."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Does Linus Torvalds agree that Linux is just the kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
@@ -3175,10 +3293,23 @@
 "Betriebssystemkern ist? <span class=\"anchor-reference-id\">(<a href="
 "\"#linusagreed\">#linusagreed</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | He recognized this at the beginning.  The earliest Linux release notes
+# | said, <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | &ldquo;Most of the tools used with linux are GNU software and are under
+# | the GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
+# |  for more info&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
+#| "versions/RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are "
+#| "GNU software and are under the GNU copyleft. These tools aren't in the "
+#| "distribution - ask me (or GNU)  for more info&rdquo;</a>."
 msgid ""
 "He recognized this at the beginning.  The earliest Linux release notes said, "
-"<a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"<a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
 "RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are GNU software "
 "and are under the GNU copyleft. These tools aren't in the distribution - ask "
 "me (or GNU)  for more info&rdquo;</a>."
@@ -3190,7 +3321,7 @@
 "Dienstprogramme sind nicht in der Distribution&#160;&#8209;&#160;fragt mich "
 "(oder GNU) für weitere Informationen.&#8220;</cite></a>"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not finish the GNU Hurd kernel, release the GNU system as a whole, and "
 "forget the question of what to call GNU/Linux? <span class=\"anchor-"
@@ -3201,7 +3332,7 @@
 "<em><b>GNU/Linux</b></em> zu nennen sei? <span class=\"anchor-reference-id\">"
 "(<a href=\"#finishhurd\">#finishhurd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We would like credit for the GNU operating system no matter which kernel is "
 "used with it."
@@ -3209,13 +3340,27 @@
 "Wir möchten für das GNU-Betriebssystem anerkannt werden, ganz gleich 
welcher "
 "Kern damit genutzt wird."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | Making the GNU Hurd work well enough to compete with Linux would be a big
+# | job, and it's not clearly necessary.  The only thing ethically wrong with
+# | Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the
+# | best fix for that problem is <a
+# | [-href=\"http://fsf.org/campaigns/priority-projects\";>-]
+# | {+href=\"https://www.fsf.org/campaigns/priority-projects\";>+} developing
+# | free replacement for the blobs</a>.
+#, fuzzy
+#| msgid ""
+#| "Making the GNU Hurd work well enough to compete with Linux would be a big "
+#| "job, and it's not clearly necessary.  The only thing ethically wrong with "
+#| "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the "
+#| "best fix for that problem is <a href=\"http://fsf.org/campaigns/priority-";
+#| "projects\"> developing free replacement for the blobs</a>."
 msgid ""
 "Making the GNU Hurd work well enough to compete with Linux would be a big "
 "job, and it's not clearly necessary.  The only thing ethically wrong with "
 "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the best "
-"fix for that problem is <a href=\"http://fsf.org/campaigns/priority-projects";
-"\"> developing free replacement for the blobs</a>."
+"fix for that problem is <a href=\"https://www.fsf.org/campaigns/priority-";
+"projects\"> developing free replacement for the blobs</a>."
 msgstr ""
 "GNU Hurd gut genug funktionierend zu machen um mit Linux zu konkurrieren, "
 "wäre eine große Aufgabenstellung und nicht unbedingt notwendig. Das 
einzige, "
@@ -3224,7 +3369,7 @@
 "\"http://fsf.org/campaigns/priority-projects\";>Entwicklung eines freien "
 "Ersatzes für die BLOBs</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The battle is already lost&mdash;society has made its decision and we can't "
 "change it, so why even think about it? <span class=\"anchor-reference-id\">"
@@ -3235,7 +3380,7 @@
 "darüber nachdenken? <span class=\"anchor-reference-id\">(<a href=\"#lost"
 "\">#lost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This isn't a battle, it is a campaign of education.  What to call the system "
 "is not a single decision, to be made at one moment by &ldquo;society&rdquo;: "
@@ -3252,7 +3397,7 @@
 "System <b>GNU/Linux</b> zu nennen&#160;&#8209;&#160;und dadurch helfen, "
 "andere zu informieren."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Society has made its decision and we can't change it, so what good does it "
 "do if I say &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id\">(<a "
@@ -3262,7 +3407,7 @@
 "ändern, also was nützt es <em><b>GNU/Linux</b></em> zu sagen? <span class="
 "\"anchor-reference-id\">(<a href=\"#whatgood\">#whatgood</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is not an all-or-nothing situation: correct and incorrect pictures are "
 "being spread more or less by various people.  If you call the system &ldquo;"
@@ -3283,7 +3428,7 @@
 "beträchtliche Anzahl von Menschen mit sehr wenig Aufwand informiert. Und "
 "einige werden die Richtigstellung an andere weitergeben."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to call the system &ldquo;Linux&rdquo; and teach "
 "people its real origin with a ten-minute explanation? <span class=\"anchor-"
@@ -3293,7 +3438,7 @@
 "Ursprung in einer zehnminütigen Erklärung zu lehren? <span class=\"anchor-"
 "reference-id\">(<a href=\"#explain\">#explain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "If you help us by explaining to others in that way, we appreciate your "
 "effort, but that is not the best method.  It is not as effective as calling "
@@ -3304,7 +3449,7 @@
 "nicht so wirkungsvoll wie das System <b>GNU/Linux</b> zu nennen, und nutzt "
 "Ihre Zeit ineffektiv."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is ineffective because it may not sink in, and surely will not "
 "propagate.  Some of the people who hear your explanation will pay attention, "
@@ -3321,7 +3466,7 @@
 "einfach <em>„Linux“</em> nennen. Ohne es besonders zu beabsichtigen, 
helfen "
 "sie, ein falsches Bild zu verbreiten."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is inefficient because it takes a lot more time.  Saying and writing "
 "&ldquo;GNU/Linux&rdquo; will take you only a few seconds a day, not minutes, "
@@ -3335,7 +3480,7 @@
 "Linux und GNU/Linux zu unterscheiden, wenn Sie schreiben und reden, ist bei "
 "weitem der einfachste Weg, dem GNU-Projekt effektiv zu helfen."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people laugh at you when you ask them to call the system GNU/Linux.  "
 "Why do you subject yourself to this treatment? <span class=\"anchor-"
@@ -3346,7 +3491,7 @@
 "Behandlung? <span class=\"anchor-reference-id\">(<a href=\"#treatment"
 "\">#treatment</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; tends to give people a mistaken "
 "picture of the system's history and reason for existence.  People who laugh "
@@ -3361,7 +3506,7 @@
 "gemacht, also lachen sie, wenn wir um Anerkennung bitten. Hätten sie die "
 "Wahrheit gewusst, würden sie wahrscheinlich nicht lachen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Why do we take the risk of making a request that sometimes leads people to "
 "ridicule us? Because often it has useful results that help the GNU Project.  "
@@ -3372,7 +3517,7 @@
 "Projekt helfen. Wir gehen das Risiko des unverdienten Missbrauchs ein, um "
 "unsere Ziele zu erreichen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you see such an ironically unfair situation occurring, please don't sit "
 "idly by.  Please teach the laughing people the real history.  When they see "
@@ -3383,7 +3528,7 @@
 "tatsächliche Geschichte. Wenn sie sehen, warum die Bitte gerechtfertigt ist, 
"
 "werden diejenigen, die auch nur etwas Verstand haben, aufhören zu lachen."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people condemn you when you ask them to call the system GNU/Linux.  "
 "Don't you lose by alienating them? <span class=\"anchor-reference-id\">(<a "
@@ -3394,7 +3539,7 @@
 "verscherzt? <span class=\"anchor-reference-id\">(<a href=\"#alienate"
 "\">#alienate</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not much.  People who don't appreciate our role in developing the system are "
 "unlikely to make substantial efforts to help us.  If they do work that "
@@ -3413,7 +3558,7 @@
 "zuzuschreiben,"
 
 # statt verscherzte Leute
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It makes no sense to worry about alienating people who are already mostly "
 "uncooperative, and it is self-defeating to be deterred from correcting a "
@@ -3426,7 +3571,7 @@
 "entrüsten, die es bewahren. Daher werden wir auch weiterhin versuchen, die "
 "falsche Bezeichnung richtigzustellen."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Whatever you contributed, is it legitimate to rename the operating system? "
 "<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
@@ -3435,7 +3580,7 @@
 "umzubenennen? <span class=\"anchor-reference-id\">(<a href=\"#rename"
 "\">#rename</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are not renaming anything; we have been calling this system &ldquo;"
 "GNU&rdquo; ever since we announced it in 1983.  The people who tried to "
@@ -3445,7 +3590,7 @@
 "seitdem wir es im Jahr 1983 ankündigten. Die Leute, die versuchten es in 
<em>"
 "„Linux“</em> umzubenennen, hätten das nicht tun sollen."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong to force people to call the system &ldquo;GNU/Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
@@ -3454,7 +3599,7 @@
 "strong> zu nennen? <span class=\"anchor-reference-id\">(<a href=\"#force"
 "\">#force</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong to force them, and we don't try.  We call the system "
 "&ldquo;GNU/Linux&rdquo;, and we ask you to do it too."
@@ -3462,7 +3607,7 @@
 "Es wäre falsch, sie zu zwingen, und wir versuchen es nicht. Wir nennen das "
 "System <b>GNU/Linux</b> und bitten Sie, es auch zu tun."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not sue people who call the whole system &ldquo;Linux&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
@@ -3471,7 +3616,7 @@
 "nennen? <span class=\"anchor-reference-id\">(<a href=\"#whynotsue"
 "\">#whynotsue</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are no legal grounds to sue them, but since we believe in freedom of "
 "speech, we wouldn't want to do that anyway.  We ask people to call the "
@@ -3482,7 +3627,7 @@
 "darum, das System <b>GNU/Linux</b> zu nennen, denn genau das ist das "
 "Richtige, das zu tun ist."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Shouldn't you put something in the GNU GPL to require people to call the "
 "system &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id\">(<a href="
@@ -3492,13 +3637,31 @@
 "System GNU zu nennen? <span class=\"anchor-reference-id\">(<a href=\"#require"
 "\">#require</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
+# | The purpose of the GNU GPL is to protect the users' freedom from those who
+# | would make proprietary versions of free software.  While it is true that
+# | those who call the system &ldquo;Linux&rdquo; often do things that limit
+# | the users' freedom, such as bundling non[---]free software with the
+# | GNU/Linux system or even developing non[---]free software for such use,
+# | the mere act of calling the system &ldquo;Linux&rdquo; does not, in
+# | itself, deny users their freedom.  It seems improper to make the GPL
+# | restrict what name people can use for the system.
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU GPL is to protect the users' freedom from those "
+#| "who would make proprietary versions of free software.  While it is true "
+#| "that those who call the system &ldquo;Linux&rdquo; often do things that "
+#| "limit the users' freedom, such as bundling non-free software with the GNU/"
+#| "Linux system or even developing non-free software for such use, the mere "
+#| "act of calling the system &ldquo;Linux&rdquo; does not, in itself, deny "
+#| "users their freedom.  It seems improper to make the GPL restrict what "
+#| "name people can use for the system."
 msgid ""
 "The purpose of the GNU GPL is to protect the users' freedom from those who "
 "would make proprietary versions of free software.  While it is true that "
 "those who call the system &ldquo;Linux&rdquo; often do things that limit the "
-"users' freedom, such as bundling non-free software with the GNU/Linux system "
-"or even developing non-free software for such use, the mere act of calling "
+"users' freedom, such as bundling nonfree software with the GNU/Linux system "
+"or even developing nonfree software for such use, the mere act of calling "
 "the system &ldquo;Linux&rdquo; does not, in itself, deny users their "
 "freedom.  It seems improper to make the GPL restrict what name people can "
 "use for the system."
@@ -3513,7 +3676,7 @@
 "das System verwenden kann, scheint eine Beschränkung der GPL unpassend zu "
 "sein."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you objected to the original BSD license's advertising requirement to "
 "give credit to the University of California, isn't it hypocritical to demand "
@@ -3526,7 +3689,7 @@
 "Verdienst des Projekts <em>‚GNU‘</em> einzufordern? <span class=\"anchor-"
 "reference-id\">(<a href=\"#BSDlicense\">#BSDlicense</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would be hypocritical to make the name GNU/Linux a license requirement, "
 "and we don't.  We only <em>ask</em> you to give us the credit we deserve."
@@ -3536,7 +3699,7 @@
 "<em>bitten</em> Sie nur darum, uns den Verdienst zuschreiben, den wir "
 "verdienen. "
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please note that there are at least <a href=\"/licenses/bsd.html\"> two "
 "different BSD licenses</a>.  For clarity's sake, please don't use the term "
@@ -3547,7 +3710,7 @@
 "bitte nicht den Begriff <em>BSD-Lizenz</em> ohne anzugeben, welche genau "
 "gemeint ist."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you failed to put something in the GNU GPL to require people to call "
 "the system &ldquo;GNU&rdquo;, you deserve what happened; why are you "
@@ -3559,7 +3722,7 @@
 "beklagt ihr euch jetzt? <span class=\"anchor-reference-id\">(<a href="
 "\"#deserve\">#deserve</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The question presupposes a rather controversial general ethical premise: "
 "that if people do not force you to treat them fairly, you are entitled to "
@@ -3571,13 +3734,13 @@
 "berechtigt sind, einen so viel wie Sie mögen auszunutzen. Mit anderen "
 "Worten, es wird davon ausgegangen, dass Macht vor Recht geht."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope you disagree with that premise just as we do."
 msgstr ""
 "Wir hoffen, dass Sie mit dieser Prämisse&#160;&#8209;&#160;genauso wie "
 "wir&#160;&#8209;&#160;nicht einverstanden sind."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't you be better off not contradicting what so many people believe? "
 "<span class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)"
@@ -3587,7 +3750,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't think we should go along with large numbers of people because they "
 "have been misled.  We hope you too will decide that truth is important."
@@ -3596,7 +3759,7 @@
 "sollten, denn sie wurden in die Irre geführt. Wir hoffen, auch Sie werden "
 "sich dafür entscheiden, dass Wahrheit wichtig ist."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We could never have developed a free operating system without first denying "
 "the belief, held by most people, that proprietary software was legitimate "
@@ -3606,7 +3769,7 @@
 "die Überzeugung der meisten Menschen zu verleugnen, dass proprietäre "
 "Software legitim und hinnehmbar wäre."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
 "<span class=\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</"
@@ -3615,13 +3778,13 @@
 "Da es viele <em>„Linux“</em> nennen, macht es das nicht richtig? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "We don't think that the popularity of an error makes it the truth."
 msgstr ""
 "Wir denken nicht, dass die Popularität eines Fehlers diesen zur Wahrheit "
 "führt."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it better to call the system by the name most users already know? "
 "<span class=\"anchor-reference-id\">(<a href=\"#knownname\">#knownname</a>)</"
@@ -3631,7 +3794,7 @@
 "Nutzer bereits kennen? <span class=\"anchor-reference-id\">(<a href="
 "\"#knownname\">#knownname</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo; includes "
 "&ldquo;Linux&rdquo;, they will recognize what you're talking about.  If you "
@@ -3643,7 +3806,7 @@
 "eine Weile <em>GNU</em> (oft fälschlicherweise als „Linux“ bezeichnet) "
 "voranstellt, werden sie alle verstehen."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many people care about what's convenient or who's winning, not about "
 "arguments of right or wrong.  Couldn't you get more of their support by a "
@@ -3655,12 +3818,24 @@
 "Unterstützung durch einen anderen Weg bekommen? <span class=\"anchor-"
 "reference-id\">(<a href=\"#winning\">#winning</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+# | To care only about what's convenient or who's winning is an amoral
+# | approach to life.  Non[---]free software is an example of that amoral
+# | approach and thrives on it.  Thus, in the long run it would be
+# | self-defeating for us to adopt that approach.  We will continue talking in
+# | terms of right and wrong.
+#, fuzzy
+#| msgid ""
+#| "To care only about what's convenient or who's winning is an amoral "
+#| "approach to life.  Non-free software is an example of that amoral "
+#| "approach and thrives on it.  Thus, in the long run it would be self-"
+#| "defeating for us to adopt that approach.  We will continue talking in "
+#| "terms of right and wrong."
 msgid ""
 "To care only about what's convenient or who's winning is an amoral approach "
-"to life.  Non-free software is an example of that amoral approach and "
-"thrives on it.  Thus, in the long run it would be self-defeating for us to "
-"adopt that approach.  We will continue talking in terms of right and wrong."
+"to life.  Nonfree software is an example of that amoral approach and thrives "
+"on it.  Thus, in the long run it would be self-defeating for us to adopt "
+"that approach.  We will continue talking in terms of right and wrong."
 msgstr ""
 "Sich nur dafür zu interessieren was praktisch ist oder wer gewinnt, ist eine 
"
 "amoralische Einstellung zum Leben. Unfreie Software ist ein Beispiel dieser "
@@ -3668,7 +3843,7 @@
 "es langfristig kontraproduktiv, uns dieser Anschauung zu unterwerfen. Wir "
 "werden weiterhin von richtig und falsch sprechen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope that you are one of those for whom right and wrong do matter."
 msgstr ""
 "Wir hoffen, dass Sie einer derjenigen sind, für die richtig und falsch eine "
@@ -3728,19 +3903,18 @@
 "standards/README.translations\">LIESMICH für Übersetzungen</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2001, [-2006, 2007, 2008,-] {+2006-2008,+} 2010, 2011,
-# | 2013, [-2014, 2015, 2016, 2017-] {+2014-2018, 2020, 2021+} Free Software
-# | Foundation, Inc.
+# | Copyright &copy; [-2001, 2006, 2007, 2008, 2010, 2011-] {+2001-2011,
+# | 2013-2018, 2020, 2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
-#| "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, "
-#| "2016, 2017 Free Software Foundation, Inc."
+#| "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation, "
+"Inc."
 msgstr ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, 2016, "
-"2017 Free Software Foundation, Inc."
+"Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011 Free Software "
+"Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -3765,6 +3939,17 @@
 msgid "Updated:"
 msgstr "Letzte Änderung:"
 
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, "
+#~| "2016, 2017 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
+#~ "Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, "
+#~ "2016, 2017 Free Software Foundation, Inc."
+
 #~ msgid "GNU/Linux FAQ by Richard Stallman"
 #~ msgstr "GNU/Linux: Häufige Fragen<br />- von Richard Stallman beantwortert"
 
@@ -4585,13 +4770,6 @@
 #~ "Foundation"
 
 #~ msgid ""
-#~ "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011 Free Software "
-#~ "Foundation, Inc."
-#~ msgstr ""
-#~ "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011 Free Software "
-#~ "Foundation, Inc."
-
-#~ msgid ""
 #~ "Android is very different from the GNU/Linux system&mdash;because it "
 #~ "contains very little of the GNU system, only Linux.  Overall, it's a "
 #~ "different system.  If you call the whole system &ldquo;Linux&rdquo;, you "

Index: gnu/po/gnu-linux-faq.es.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.es.po,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -b -r1.140 -r1.141
--- gnu/po/gnu-linux-faq.es.po  30 Apr 2021 09:12:02 -0000      1.140
+++ gnu/po/gnu-linux-faq.es.po  30 Aug 2021 13:34:52 -0000      1.141
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-04-08 11:35+0200\n"
 "Last-Translator: Javier Fdez. Retenaga <jfrtnaga@gnu.org>\n"
 "Language-Team: Spanish <www-es-general@gnu.org>\n"
@@ -18,6 +18,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "X-Generator: Poedit 2.2.1\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
@@ -28,31 +29,16 @@
 "Preguntas frecuentes sobre GNU/Linux - Proyecto GNU - Free Software "
 "Foundation "
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU/Linux FAQ"
 msgstr "Preguntas frecuentes sobre GNU/Linux"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by Richard Stallman"
 msgstr "por Richard Stallman"
 
-# type: Content of: <div><blockquote><p>
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
-"linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a href=\"/"
-"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Si quiere saber más sobre este tema, puede leer también los siguientes "
-"artículos: <a href=\"/gnu/linux-and-gnu.html\">Linux y el Proyecto GNU</a>, "
-"<a href=\"/gnu/why-gnu-linux.html\">¿Por qué GNU/Linux?</a> y <a 
href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">Usuarios de GNU que nunca han oído "
-"hablar de GNU</a>."
-
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When people see that we use and recommend the name GNU/Linux for a system "
 "that many others call just &ldquo;Linux&rdquo;, they ask many questions.  "
@@ -62,6 +48,13 @@
 "hacer referencia a un sistema que muchos otros llaman solo «Linux», se 
hacen "
 "muchas preguntas. Aquí mencionamos las más habituales, y nuestras 
respuestas."
 
+#. type: Content of: <div><div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "Índice general"
+
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<a href=\"#why\">Why do you call the system we use GNU/Linux and not Linux?</"
@@ -661,8 +654,36 @@
 "va ganando, no los argumentos sobre lo que es o no correcto. ¿No se "
 "obtendría mayor apoyo por una vía distinta?</a>"
 
+# type: Content of: <div><blockquote><p>
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
+# | {+System</a>,+} our page on <a href=\"/gnu/why-gnu-linux.html\">Why
+# | GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our page on <a href=\"/"
+#| "gnu/linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a "
+#| "href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
+"linux-and-gnu.html\">Linux and the GNU System</a>, our page on <a href=\"/"
+"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Si quiere saber más sobre este tema, puede leer también los siguientes "
+"artículos: <a href=\"/gnu/linux-and-gnu.html\">Linux y el Proyecto GNU</a>, "
+"<a href=\"/gnu/why-gnu-linux.html\">¿Por qué GNU/Linux?</a> y <a 
href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">Usuarios de GNU que nunca han oído "
+"hablar de GNU</a>."
+
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you call the system we use GNU/Linux and not Linux? <span class="
 "\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>"
@@ -671,7 +692,7 @@
 "\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Most operating system distributions based on Linux as kernel are basically "
 "modified versions of the GNU operating system.  We began developing GNU in "
@@ -691,12 +712,12 @@
 "sistema. La idea básica también fue nuestra."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "In fairness, we ought to get at least equal mention."
 msgstr "Para ser justos, deberíamos tener al menos una mención igual."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and the GNU System</a> and <a "
 "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
@@ -710,7 +731,7 @@
 "GNU</a>."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why is the name important? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
@@ -719,7 +740,7 @@
 "href=\"#whycare\">#whycare</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Although the developers of Linux, the kernel, are contributing to the free "
 "software community, many of them do not care about freedom.  People who "
@@ -735,7 +756,7 @@
 "excesiva importancia a los puntos de vista de esos programadores."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Calling the system GNU/Linux recognizes the role that our idealism played in "
 "building our community, and <a href=\"/gnu/why-gnu-linux.html\">helps the "
@@ -747,7 +768,7 @@
 "estos ideales</a>."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the real relationship between GNU and Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#what\">#what</a>)</span>"
@@ -755,7 +776,7 @@
 "¿Cuál es la verdadera relación entre GNU y Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#what\">#what</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU operating system and the Linux kernel are separate software projects "
 "that do complementary jobs.  Typically they are packaged in a <a href=\"/"
@@ -767,7 +788,7 @@
 "Linux</a> y se utilizan juntos."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How did it come about that most people call the system &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
@@ -778,7 +799,7 @@
 "span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; is a confusion that has spread faster "
 "than the corrective information."
@@ -787,7 +808,7 @@
 "rápidamente que la información que la corrige."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who combined Linux with the GNU system were not aware that that's "
 "what their activity amounted to.  They focused their attention on the piece "
@@ -807,7 +828,7 @@
 "ventaja."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the people who call the system &ldquo;Linux&rdquo; have never heard "
 "why that's not the right thing.  They saw others using that name and assume "
@@ -826,7 +847,7 @@
 "tiende a reforzar la idea de que al sistema habría que llamarlo «Linux»."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Many of the questions in this file represent people's attempts to justify "
 "the name they are accustomed to using."
@@ -835,7 +856,7 @@
 "de justificar el nombre que están acostumbrados a emplear."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we always say &ldquo;GNU/Linux&rdquo; instead of &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
@@ -844,7 +865,7 @@
 "\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not always&mdash;only when you're talking about the whole system.  When "
 "you're referring specifically to the kernel, you should call it &ldquo;"
@@ -855,7 +876,7 @@
 "nombre que eligió su programador."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
 "call the whole system by the same name as the kernel.  This causes many "
@@ -871,7 +892,7 @@
 "todo el sistema, y «Linux» al núcleo."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Would Linux have achieved the same success if there had been no GNU? <span "
 "class=\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</"
@@ -881,7 +902,7 @@
 "\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In that alternative world, there would be nothing today like the GNU/Linux "
 "system, and probably no free operating system at all.  No one attempted to "
@@ -896,7 +917,7 @@
 "específicamente que comenzara a liberar su código."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds was partly influenced by a speech about GNU in Finland in "
 "1990.  It's possible that even without this influence he might have written "
@@ -911,7 +932,7 @@
 "de GNU. (Vea las notas de publicación de la versión 0.12.)"
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Even if Torvalds had released Linux under some other free software license, "
 "a free kernel alone would not have made much difference to the world.  The "
@@ -924,7 +945,7 @@
 "marco más amplio, en un sistema operativo completamente libre: GNU/Linux."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better for the community if you did not divide people with "
 "this request? <span class=\"anchor-reference-id\">(<a href=\"#divide"
@@ -935,7 +956,7 @@
 "a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
 "people.  We are asking them to give the GNU Project credit for the GNU "
@@ -946,7 +967,7 @@
 "operativo GNU. Esto no supone criticar ni rechazar a nadie."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, there are people who do not like our saying this.  Sometimes those "
 "people push us away in response.  On occasion they are so rude that one "
@@ -961,7 +982,7 @@
 "que puedan convencerles de que abandonen esa actitud."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, this is only a secondary cause of division in our community.  The "
 "largest division in the community is between people who appreciate free "
@@ -979,7 +1000,7 @@
 "eficiente (el movimiento del código abierto)."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This disagreement is not just a matter of names&mdash;it is a matter of "
 "differing basic values.  It is essential for the community to see and think "
@@ -996,7 +1017,7 @@
 "pierde de vista lo esencial del software libre</a>."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The disagreement over values partially aligns with the amount of attention "
 "people pay to the GNU Project's role in our community.  People who value "
@@ -1022,7 +1043,7 @@
 "(lo que no será fácil) o seamos derrotados por completo (esperemos que no)."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Doesn't the GNU project support an individual's free speech rights to call "
 "the system by any name that individual chooses? <span class=\"anchor-"
@@ -1033,7 +1054,7 @@
 "reference-id\">(<a href=\"#freespeech\">#freespeech</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Yes, indeed, we believe you have a free speech right to call the operating "
 "system by any name you wish.  We ask that people call it GNU/Linux as a "
@@ -1049,7 +1070,7 @@
 "sistema."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since everyone knows the role of GNU in developing the system, doesn't the "
 "&ldquo;GNU/&rdquo; in the name go without saying? <span class=\"anchor-"
@@ -1061,7 +1082,7 @@
 "</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Experience shows that the system's users, and the computer-using public in "
 "general, often know nothing about the GNU system.  Most articles about the "
@@ -1077,7 +1098,7 @@
 "GNU</a>."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who say this are probably geeks thinking of the geeks they know.  "
 "Geeks often do know about GNU, but many have a completely wrong idea of what "
@@ -1091,7 +1112,7 @@
 "\">«herramientas»</a>, o un proyecto para desarrollar herramientas."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The wording of this question, which is typical, illustrates another common "
 "misconception.  To speak of &ldquo;GNU's role&rdquo; in developing something "
@@ -1105,7 +1126,7 @@
 "del papel del Proyecto GNU en tal o cual actividad, pero no en la de GNU."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since I know the role of GNU in this system, why does it matter what name I "
 "use? <span class=\"anchor-reference-id\">(<a href="
@@ -1116,7 +1137,7 @@
 "\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your words don't reflect your knowledge, you don't teach others.  Most "
 "people who have heard of the GNU/Linux system think it is &ldquo;"
@@ -1129,7 +1150,7 @@
 "no les dice nada, ¿quién lo hará?"
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't shortening &ldquo;GNU/Linux&rdquo; to &ldquo;Linux&rdquo; just like "
 "shortening &ldquo;Microsoft Windows&rdquo; to &ldquo;Windows&rdquo;? <span "
@@ -1140,7 +1161,7 @@
 "href=\"#windows\">#windows</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It's useful to shorten a frequently-used name, but not if the abbreviation "
 "is misleading."
@@ -1149,7 +1170,7 @@
 "a engaño."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Almost everyone in developed countries really does know that the &ldquo;"
 "Windows&rdquo; system is made by Microsoft, so shortening &ldquo;Microsoft "
@@ -1164,7 +1185,7 @@
 "equivocada acerca de la procedencia del sistema."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The question is itself misleading because GNU and Microsoft are not the same "
 "kind of thing.  Microsoft is a company; GNU is an operating system."
@@ -1173,7 +1194,7 @@
 "tipo. Microsoft es una compañía, GNU es un sistema operativo."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't GNU a collection of programming tools that were included in Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
@@ -1183,7 +1204,7 @@
 "\">#tools</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "People who think that Linux is an entire operating system, if they hear "
 "about GNU at all, often get a wrong idea of what GNU is.  They may think "
@@ -1202,7 +1223,7 @@
 "marco conceptual en el que ese sistema operativo es etiquetado como 
«Linux»."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Project was named after the GNU operating system&mdash;it's the "
 "project to develop the GNU system.  (See <a href=\"/gnu/initial-announcement."
@@ -1213,7 +1234,7 @@
 "html\">anuncio inicial de 1983</a>)."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We developed programs such as GCC, GNU Emacs, GAS, GLIBC, BASH, etc., "
 "because we needed them for the GNU operating system.  GCC, the GNU Compiler "
@@ -1229,7 +1250,7 @@
 "GNUCash, GNU Chess y GNOME para el sistema GNU."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the difference between an operating system and a kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
@@ -1238,7 +1259,7 @@
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "An operating system, as we use the term, means a collection of programs that "
 "are sufficient to use the computer to do a wide variety of jobs.  A general "
@@ -1252,7 +1273,7 @@
 "tareas que muchos usuarios pueden querer llevar a cabo."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The kernel is one of the programs in an operating system&mdash;the program "
 "that allocates the machine's resources to the other programs that are "
@@ -1264,7 +1285,7 @@
 "programas."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "To confuse matters, some people use the term &ldquo;operating system&rdquo; "
 "to mean &ldquo;kernel&rdquo;.  Both uses of the term go back many years.  "
@@ -1286,7 +1307,7 @@
 "expresión «sistema operativo» en el mismo sentido."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the time when people speak of the &ldquo;Linux operating "
 "system&rdquo; they are using &ldquo;operating system&rdquo; in the same "
@@ -1304,7 +1325,7 @@
 "ambigüedad acerca de la parte del software a la que se refiere."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
@@ -1317,7 +1338,7 @@
 "Linux."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The kernel of a system is like the foundation of a house.  How can a house "
 "be almost complete when it doesn't have a foundation? <span class=\"anchor-"
@@ -1328,7 +1349,7 @@
 "reference-id\">(<a href=\"#house\">#house</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "A kernel is not much like the foundation of a house because building an "
 "operating system is not much like building a house."
@@ -1337,7 +1358,7 @@
 "construir un sistema operativo no tiene mucho que ver con construir una casa."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A house is built from lots of little general parts that are cut and put "
 "together in situ.  They have to be put together from the bottom up.  Thus, "
@@ -1351,7 +1372,7 @@
 "suelo."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "By contrast, an operating system consists of complex components that can be "
 "developed in any order.  When you have developed most of the components, "
@@ -1369,7 +1390,7 @@
 "GNU en 1992."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't the kernel the brain of the system? <span class=\"anchor-reference-id"
 "\">(<a href=\"#brain\">#brain</a>)</span>"
@@ -1378,7 +1399,7 @@
 "(<a href=\"#brain\">#brain</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A computer system is not much like a human body, and no part of it plays a "
 "role comparable to that of the brain in a human."
@@ -1387,7 +1408,7 @@
 "partes juega un papel equiparable al del cerebro de un ser humano."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't writing the kernel most of the work in an operating system? <span "
 "class=\"anchor-reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</"
@@ -1398,12 +1419,12 @@
 "\">#kernelmost</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "No, many components take a lot of work."
 msgstr "No, hay muchos componentes que llevan gran cantidad de trabajo."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "An operating system requires a kernel.  Since the GNU Project didn't develop "
 "a kernel, how can the system be GNU?<span class=\"anchor-reference-id\">(<a "
@@ -1413,7 +1434,7 @@
 "desarrolló un núcleo, ¿cómo puede el sistema ser GNU?<span 
class=\"anchor-"
 "reference-id\">(<a href=\"#nokernel\">#nokernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The people who argue that way for calling the system &ldquo;Linux&rdquo; are "
 "using a double standard.  An operating system requires compilers, editors, "
@@ -1427,7 +1448,7 @@
 "a lo que los sistemas BSD incluían en 1983. Puesto que Torvalds no "
 "desarrolló nada de eso, ¿cómo puede el sistema ser «Linux»?"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "That standard is too strict, not the right way to judge the contributions of "
 "any contributor."
@@ -1435,7 +1456,7 @@
 "El criterio es demasiado estricto, no es la manera correcta de juzgar la "
 "contribución de ningún contribuidor. "
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds made an important contribution to the operating system we "
 "use; the GNU Project started earlier and contributed much more.  The name "
@@ -1446,7 +1467,7 @@
 "«GNU/Linux» concede reconocimiento a ambos."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How can GNU be an operating system, if I can't get something called &ldquo;"
 "GNU&rdquo; and install it? <span class=\"anchor-reference-id\">(<a href="
@@ -1456,7 +1477,7 @@
 "pueda instalarse? <span class=\"anchor-reference-id\">(<a href="
 "\"#notinstallable\">#notinstallable</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Many <a href=\"/distros/distros.html\"> packaged and installable versions of "
 "GNU</a> are available.  None of them is called simply &ldquo;GNU&rdquo;, but "
@@ -1466,7 +1487,7 @@
 "empaquetadas y listas para instalar</a>. Ninguna de ellas se llama "
 "simplemente «GNU», aunque básicamente son GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We expected to release the GNU system packaged for installation, but this "
 "plan was overtaken by events: in 1992 others were already packaging GNU "
@@ -1487,7 +1508,7 @@
 "reservado para una versión del sistema con el núcleo Hurd de GNU, que aún 
no "
 "estaba listo."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Hurd kernel never became sufficiently ready; we only recommend it to "
 "those interested in working on it.  So we never packaged GNU with the GNU "
@@ -1498,7 +1519,7 @@
 "manera que nunca empaquetamos GNU con el núcleo Hurd de GNU. Sin embargo, "
 "Debian ha empaquetado esta combinación bajo el nombre de Debian GNU/Hurd."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are now developing an advanced Scheme-based package manager called Guix "
 "and a complete system distribution based on it called the <a href=\"/"
@@ -1511,7 +1532,7 @@
 "sistema GUIX</a> o <abbr title=\"Guix System Distribution\">GuixSD</abbr>. "
 "Esto implica volver a empaquetar una parte considerable del sistema GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We never took the last step of packaging GNU under the name &ldquo;"
 "GNU&rdquo;, but that doesn't alter what kind of thing GNU is.  GNU is an "
@@ -1521,7 +1542,7 @@
 "pero esto no cambia la naturaleza de GNU. GNU es un sistema operativo."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "We're calling the whole system after the kernel, Linux.  Isn't it normal to "
 "name an operating system after a kernel? <span class=\"anchor-reference-id\">"
@@ -1532,7 +1553,7 @@
 "reference-id\">(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "That practice seems to be very rare&mdash;we can't find any examples other "
 "than the misuse of the name &ldquo;Linux&rdquo;.  Normally an operating "
@@ -1549,7 +1570,7 @@
 "tal»."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Because those two constructions are used synonymously, the expression &ldquo;"
 "the Linux kernel&rdquo; can easily be misunderstood as meaning &ldquo;the "
@@ -1564,7 +1585,7 @@
 "núcleo, Linux» o «Linux, el núcleo»."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can another system have &ldquo;the feel of Linux&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
@@ -1572,7 +1593,7 @@
 "¿Se puede tener la «sensación de Linux» con otro sistema? <span class="
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is no such thing as the &ldquo;feel of Linux&rdquo; because Linux has "
 "no user interfaces.  Like any modern kernel, Linux is a base for running "
@@ -1588,7 +1609,7 @@
 "«sensación»."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  How about "
 "recommending a shorter name? <span class=\"anchor-reference-id\">(<a href="
@@ -1599,7 +1620,7 @@
 "\"#long\">#long</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "For a while we tried the name &ldquo;LiGNUx&rdquo;, which combines the words "
 "&ldquo;GNU&rdquo; and &ldquo;Linux&rdquo;.  The reaction was very bad.  "
@@ -1610,7 +1631,7 @@
 "aceptación."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
 "call it &ldquo;GNU/Linux&rdquo; <a href=\"#justgnu\"> for the reasons given "
@@ -1621,7 +1642,7 @@
 "adelante</a>."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How about calling the system &ldquo;GliNUx&rdquo; (instead of &ldquo;GNU/"
 "Linux&rdquo;)? <span class=\"anchor-reference-id\">(<a href="
@@ -1630,7 +1651,7 @@
 "¿Qué les parece llamar al sistema «GliNU» (en lugar de «GNU/Linux»)? 
<span "
 "class=\"anchor-reference-id\">(<a href=\"#long1\">#long1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The name &ldquo;GNU&rdquo; does not visibly appear in &ldquo;Glinux,&rdquo; "
 "so most people would not notice it is there.  Even if it is capitalized as "
@@ -1642,7 +1663,7 @@
 "mayúsculas, como «GliNUx», la mayor parte de la gente no advertirá que se 
"
 "incluye una referencia a GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be comparable to writing &ldquo;GNU/Linux,&rdquo; but putting "
 "&ldquo;GNU/&rdquo; in print so small that most people could not read it."
@@ -1651,7 +1672,7 @@
 "que la mayoría de la gente no pudiera leerla."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  Why should "
 "I go to the trouble of saying &ldquo;GNU/&rdquo;? <span class=\"anchor-"
@@ -1661,7 +1682,7 @@
 "tomarme el trabajo de decir «GNU/»? <span class=\"anchor-reference-id\">(<a 
"
 "href=\"#long2\">#long2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
 "the system that we developed, can't you take one second to recognize our "
@@ -1672,7 +1693,7 @@
 "nuestro trabajo?"
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Unfortunately, &ldquo;GNU/Linux&rdquo; is five syllables. People won't use "
 "such a long term. Shouldn't you find a shorter one? <span class=\"anchor-"
@@ -1682,7 +1703,7 @@
 "un término tan largo. ¿No deberían buscar uno más corto? <span class="
 "\"anchor-reference-id\">(<a href=\"#long3\">#long3</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, &ldquo;GNU/Linux&rdquo; is only four syllables.  &ldquo;"
 "Unfortunately&rdquo; is five syllables, yet people show no sign of "
@@ -1692,7 +1713,7 @@
 "seis, y sin embargo la gente no muestra ningún rechazo a emplear esa 
palabra."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Stallman doesn't ask us to call him &ldquo;Richard Matthew Stallman&rdquo; "
 "every the time.  So why ask us to say &ldquo;GNU/Linux&rdquo; every time? "
@@ -1702,7 +1723,7 @@
 "que ¿por qué pedirnos que digamos «GNU/Linux» cada vez? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#long4\">#long4</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Omitting &ldquo;Matthew&rdquo; does not misrepresent anything important "
 "about Stallman's nature, origin, ideas or purpose.  Omitting &ldquo;"
@@ -1712,7 +1733,7 @@
 "Stallman, de su origen, ideas u objetivos, mientras que omitir «GNU» "
 "distorsiona todo ello con respecto al sistema GNU/Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is an example of a frequent way of hiding a fallacy: to bury it inside "
 "a misleading analogy.  A better analogy would be, &ldquo;Why shouldn't we "
@@ -1723,7 +1744,7 @@
 "no llamamos a Stalman &ldquo;Torvalds&rdquo;?»"
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since Linux is a secondary contribution, would it be false to the facts to "
 "call the system simply &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id"
@@ -1734,7 +1755,7 @@
 "\"#justgnu\">#justgnu</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would not be false to the facts, but it is not the best thing to do.  "
 "Here are the reasons we call that system version &ldquo;GNU/Linux&rdquo; "
@@ -1745,7 +1766,7 @@
 "versión del sistema:"
 
 # type: Content of: <dl><dd><ul><li>
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It's not exactly GNU&mdash;it has a different kernel (that is, Linux).  "
 "Distinguishing GNU/Linux from GNU is useful."
@@ -1754,7 +1775,7 @@
 "conveniente distinguir GNU/Linux de GNU."
 
 # type: Content of: <dl><dd><ul><li>
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It would be ungentlemanly to ask people to <em>stop</em> giving any credit "
 "to Linus Torvalds.  He did write an important component of the system.  We "
@@ -1775,7 +1796,7 @@
 "contribución al sistema."
 
 # type: Content of: <dl><dd><ul><li>
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
 "&ldquo;GNU&rdquo; they may simply not recognize we're talking about the same "
@@ -1787,7 +1808,7 @@
 "decimos «GNU/Linux», pueden relacionarlo con lo que han oído."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "I would have to pay a fee if I use &ldquo;Linux&rdquo; in the name of a "
 "product, and that would also apply if I say &ldquo;GNU/Linux&rdquo;.  Is it "
@@ -1801,7 +1822,7 @@
 "reference-id\">(<a href=\"#trademarkfee\">#trademarkfee</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There's nothing wrong in calling the system &ldquo;GNU&rdquo;; basically, "
 "that's what it is.  It is nice to give Linus Torvalds a share of the credit "
@@ -1812,7 +1833,7 @@
 "pero no tiene obligación de pagar para poder hacerlo."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "So if you want to refer to the system simply as &ldquo;GNU&rdquo;, to avoid "
 "paying the fee for calling it &ldquo;Linux&rdquo;, we won't criticize you."
@@ -1821,7 +1842,7 @@
 "referirse al sistema simplemente como «GNU», no le censuraremos."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today; it includes "
 "TeX, X11, Apache, Perl, and many more programs.  Don't your arguments imply "
@@ -1836,7 +1857,7 @@
 "\"anchor-reference-id\">(<a href=\"#many\">#many</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "What we say is that you ought to give the system's principal developer a "
 "share of the credit.  The principal developer is the GNU Project, and the "
@@ -1847,7 +1868,7 @@
 "principal es el Proyecto GNU, y el sistema es básicamente GNU."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you feel even more strongly about giving credit where it is due, you "
 "might feel that some secondary contributors also deserve credit in the "
@@ -1864,7 +1885,7 @@
 "GNU/Linux/Perl, adelante."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Since a long name such as GNU/X11/Apache/Linux/TeX/Perl/Python/FreeCiv "
 "becomes absurd, at some point you will have to set a threshold and omit the "
@@ -1879,7 +1900,7 @@
 "no le plantearemos objeciones."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Different threshold levels would lead to different choices of name for the "
 "system.  But one name that cannot result from concerns of fairness and "
@@ -1895,7 +1916,7 @@
 "contribución principal (GNU)."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "systemd plays an important role in the GNU/Linux system as it is today; are "
 "we obligated to call it GNU/systemd/Linux? <span class=\"anchor-reference-id"
@@ -1905,7 +1926,7 @@
 "en la actualidad; ¿estamos obligados a llamarlo GNU/systemd/Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#others\">#others</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "systemd is a fairly important component, but not as important as the kernel "
 "(Linux), nor as important as the basis of the system as a whole (GNU).  "
@@ -1918,7 +1939,7 @@
 "sistema «GNU/systemd/Linux», no hay nada malo en hacerlo."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today, but they don't "
 "insist on calling it XYZ/Linux.  Why should we treat GNU specially? <span "
@@ -1930,7 +1951,7 @@
 "\">#others</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Thousands of projects have developed programs commonly included in today's "
 "GNU/Linux systems.  They all deserve credit for their contributions, but "
@@ -1943,7 +1964,7 @@
 "completo, por lo que no piden que se les reconozca como tales."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is different because it is more than just a contributed program, more "
 "than just a collection of contributed programs.  GNU is the framework on "
@@ -1954,7 +1975,7 @@
 "el sistema."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "GNU is a small fraction of the system nowadays, so why should we mention it? "
 "<span class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</"
@@ -1965,7 +1986,7 @@
 "\"#allsmall\">#allsmall</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In 2008, we found that GNU packages made up 15% of the &ldquo;main&rdquo; "
 "repository of the gNewSense GNU/Linux distribution.  Linux made up 1.5%.  So "
@@ -1978,7 +1999,7 @@
 "mayor razón al hecho de llamarlo «Linux»."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is a small fraction of the system nowadays, and Linux is an even smaller "
 "fraction.  But they are the system's core; the system was made by combining "
@@ -1990,7 +2011,7 @@
 "apropiado."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many companies contributed to the system as it is today; doesn't that mean "
 "we ought to call it GNU/Red&nbsp;Hat/Novell/Linux? <span class=\"anchor-"
@@ -2002,7 +2023,7 @@
 "a>)</span>"
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is not comparable to Red Hat or Novell; it is not a company, or an "
 "organization, or even an activity.  GNU is an operating system.  (When we "
@@ -2017,7 +2038,7 @@
 "la cual GNU debe aparecer en el nombre."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Much of those companies' contribution to the GNU/Linux system lies in the "
 "code they have contributed to various GNU packages including GCC and GNOME.  "
@@ -2030,7 +2051,7 @@
 "todos los demás desarrolladores de GNU."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
@@ -2040,7 +2061,7 @@
 "reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean "
@@ -2053,7 +2074,7 @@
 "ajusta a la realidad."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is not a GNU package; that is, it wasn't developed under the GNU "
 "Project's aegis or contributed specifically to the GNU Project.  Linus "
@@ -2066,14 +2087,32 @@
 "De modo que el significado «Linux, que es un paquete de GNU» no es 
correcto."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | We're not talking about a distinct GNU version of Linux, the kernel.  The
+# | free GNU/Linux distros do have a <a
+# | [-href=\"http://directory.fsf.org/project/linux\";>separate-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>separate+} version
+# | of Linux</a>, since the &ldquo;standard&rdquo; version contains
+# | non[---]free firmware &ldquo;blobs&rdquo;.  If this were part of the GNU
+# | Project, it could be considered &ldquo;GNU Linux&rdquo;; but we would not
+# | want to call it that, because it would be too confusing.
+#, fuzzy
+#| msgid ""
+#| "We're not talking about a distinct GNU version of Linux, the kernel.  The "
+#| "free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/";
+#| "project/linux\">separate version of Linux</a>, since the &ldquo;"
+#| "standard&rdquo; version contains non-free firmware &ldquo;blobs&rdquo;.  "
+#| "If this were part of the GNU Project, it could be considered &ldquo;GNU "
+#| "Linux&rdquo;; but we would not want to call it that, because it would be "
+#| "too confusing."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
-"free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/project/";
-"linux\">separate version of Linux</a>, since the &ldquo;standard&rdquo; "
-"version contains non-free firmware &ldquo;blobs&rdquo;.  If this were part "
-"of the GNU Project, it could be considered &ldquo;GNU Linux&rdquo;; but we "
-"would not want to call it that, because it would be too confusing."
+"free GNU/Linux distros do have a <a href=\"https://directory.fsf.org/wiki/";
+"Linux-libre\">separate version of Linux</a>, since the &ldquo;"
+"standard&rdquo; version contains nonfree firmware &ldquo;blobs&rdquo;.  If "
+"this were part of the GNU Project, it could be considered &ldquo;GNU "
+"Linux&rdquo;; but we would not want to call it that, because it would be too "
+"confusing."
 msgstr ""
 "No estamos hablando de una versión particular del núcleo Linux para GNU. 
Las "
 "distribuciones GNU/Linux libres sí tienen una <a 
href=\"http://directory.fsf.";
@@ -2083,7 +2122,7 @@
 "Linux»; pero no queremos llamarlo así porque sería demasiado confuso."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We're talking about a version of GNU, the operating system, distinguished by "
 "having Linux as the kernel.  A slash fits the situation because it means "
@@ -2096,7 +2135,7 @@
 "combinación de GNU con Linux, por eso «GNU/Linux»."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are other ways to express &ldquo;combination&rdquo;.  If you think "
 "that a plus-sign is clearer, please use that.  In French, a hyphen is clear: "
@@ -2108,7 +2147,7 @@
 "Linux». En español a veces decimos «GNU con Linux»."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How is the name &ldquo;GNU/Linux&rdquo; pronounced? <span class=\"anchor-"
 "reference-id\">(<a href=\"#pronounce\">#pronounce</a>)</span>"
@@ -2116,7 +2155,7 @@
 "¿Cómo se pronuncia «GNU/Linux»? <span class=\"anchor-reference-id\">(<a 
href="
 "\"#pronounce\">#pronounce</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please pronounce it as &ldquo;GNU slash Linux.&rdquo; If you don't pronounce "
 "the slash, people will think you are saying &ldquo;GNU Linux,&rdquo; which "
@@ -2127,7 +2166,7 @@
 "denominación apropiada para la combinación</a>."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU Emacs&rdquo; rather than &ldquo;GNU/"
 "Emacs&rdquo;? <span class=\"anchor-reference-id\">(<a href=\"#whynoslash"
@@ -2137,7 +2176,7 @@
 "reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Emacs&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Emacs&rdquo;.  That is the right "
@@ -2149,7 +2188,7 @@
 "Linux de GNU» como «Linux, que es un paquete de GNU». Ninguna de esos "
 "significados se ajusta a la realidad."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;GNU/Emacs&rdquo; would mean the combination of GNU, the operating "
 "system, and the program Emacs.  That doesn't fit this program, so &ldquo;GNU/"
@@ -2160,7 +2199,7 @@
 "manera correcta de referirse a él."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why &ldquo;GNU/Linux&rdquo; rather than &ldquo;Linux/GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
@@ -2169,7 +2208,7 @@
 "\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is right and proper to mention the principal contribution first.  The GNU "
 "contribution to the system is not only bigger than Linux and prior to Linux, "
@@ -2179,7 +2218,7 @@
 "contribución de GNU al sistema no sólo es mayor y anterior que la de Linux, 
"
 "en realidad dio inicio a toda la actividad."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the lowest "
 "level of the system and GNU fills technically higher levels."
@@ -2188,7 +2227,7 @@
 "inferior del sistema, mientras que GNU cubre niveles técnicamente 
superiores."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
 "lot better than what people usually do, which is to omit GNU entirely and "
@@ -2199,7 +2238,7 @@
 "GNU y dar la impresión de que el sistema completo es Linux."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
 "say anything about what the system consists of.  Why shouldn't they call it "
@@ -2211,7 +2250,7 @@
 "llamarla como quieran? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames0\">#distronames0</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling a system &ldquo;Foobar Linux&rdquo; implies that it's a flavor of "
 "&ldquo;Linux,&rdquo; and people <a href=\"#distronames\">understand it that "
@@ -2220,7 +2259,7 @@
 "Llamar a un sistema «XYZ Linux» implica que es una variante de «Linux», y 
<a "
 "href=\"#distronames\">así lo entiende</a> la gente."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If they called a GNU/Linux distro &ldquo;Foobar BSD,&rdquo; you would call "
 "that a mistake.  &ldquo;This system is not BSD,&rdquo; you would tell them.  "
@@ -2230,7 +2269,7 @@
 "error. «Este sistema no es BSD», les diría. Pues bien, tampoco es Linux."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro is called &ldquo;Foobar Linux&rdquo;; doesn't that show it's "
 "really Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
@@ -2240,7 +2279,7 @@
 "verdaderamente Linux? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames\">#distronames</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It means that the people who make the &ldquo;Foobar Linux&rdquo; distro are "
 "repeating the common mistake. We appreciate that distributions like Debian, "
@@ -2255,7 +2294,7 @@
 "distribución les anime a hacer lo mismo."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's official name is &ldquo;Foobar Linux&rdquo;; isn't it wrong to "
 "call the distro anything but &ldquo;Foobar Linux&rdquo;? <span class="
@@ -2265,7 +2304,7 @@
 "a la distribución de otra manera que no sea «XYZ Linux»? <span class="
 "\"anchor-reference-id\">(<a href=\"#distronames1\">#distronames1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When they spread misinformation by changing &ldquo;GNU&rdquo; to &ldquo;"
 "Linux&rdquo;, and call their version of it &ldquo;Foobar Linux&rdquo;, it's "
@@ -2277,7 +2316,7 @@
 "la llame «XYZ GNU/Linux»."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be more effective to ask companies such as Mandrake, Red Hat and "
 "IBM to call their distributions &ldquo;GNU/Linux&rdquo; rather than asking "
@@ -2290,7 +2329,7 @@
 "\">#companies</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It isn't a choice of one or the other&mdash;we ask companies and "
 "organizations and individuals to help spread the word about this.  In fact, "
@@ -2309,7 +2348,7 @@
 "compañía no le preocupaba qué era lo correcto."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We can't make them do this right, but we're not the sort to give up just "
 "because the road isn't easy.  You may not have as much influence at your "
@@ -2324,7 +2363,7 @@
 "ganancias llamándolo «GNU/Linux»."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to reserve the name &ldquo;GNU/Linux&rdquo; for "
 "distributions that are purely free software? After all, that is the ideal of "
@@ -2337,15 +2376,35 @@
 "\">#reserve</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+# | The widespread practice of adding non[---]free software to the GNU/Linux
+# | system is a major problem for our community.  It teaches the users that
+# | non[---]free software is ok, and that using it is part of the spirit of
+# | &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of
+# | their mission to help users use non[---]free add-ons, and may even invite
+# | salesmen to come and make sales pitches for them.  They adopt goals such
+# | as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them
+# | use non[---]free applications and drivers), or making the system more
+# | popular even at the cost of freedom.
+#, fuzzy
+#| msgid ""
+#| "The widespread practice of adding non-free software to the GNU/Linux "
+#| "system is a major problem for our community.  It teaches the users that "
+#| "non-free software is ok, and that using it is part of the spirit of "
+#| "&ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part "
+#| "of their mission to help users use non-free add-ons, and may even invite "
+#| "salesmen to come and make sales pitches for them.  They adopt goals such "
+#| "as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them "
+#| "use non-free applications and drivers), or making the system more popular "
+#| "even at the cost of freedom."
 msgid ""
-"The widespread practice of adding non-free software to the GNU/Linux system "
-"is a major problem for our community.  It teaches the users that non-free "
+"The widespread practice of adding nonfree software to the GNU/Linux system "
+"is a major problem for our community.  It teaches the users that nonfree "
 "software is ok, and that using it is part of the spirit of &ldquo;"
 "Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of their "
-"mission to help users use non-free add-ons, and may even invite salesmen to "
+"mission to help users use nonfree add-ons, and may even invite salesmen to "
 "come and make sales pitches for them.  They adopt goals such as &ldquo;"
-"helping the users&rdquo; of GNU/Linux (including helping them use non-free "
+"helping the users&rdquo; of GNU/Linux (including helping them use nonfree "
 "applications and drivers), or making the system more popular even at the "
 "cost of freedom."
 msgstr ""
@@ -2361,12 +2420,12 @@
 "de la libertad."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The question is how to try to change this."
 msgstr "La pregunta es cómo tratar de cambiar esto."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Given that most of the community which uses GNU with Linux already does not "
 "realize that's what it is, for us to disown these adulterated versions, "
@@ -2382,13 +2441,29 @@
 "GNU."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The way to lead these users to see a connection with freedom is exactly
+# | the opposite: to inform them that all these system versions <em>are</em>
+# | versions of GNU, that they all are based on a system that exists
+# | specifically for the sake of the users' freedom.  With this understanding,
+# | they can start to recognize the distributions that include non[---]free
+# | software as perverted, adulterated versions of GNU, instead of thinking
+# | they are proper and appropriate &ldquo;versions of Linux&rdquo;.
+#, fuzzy
+#| msgid ""
+#| "The way to lead these users to see a connection with freedom is exactly "
+#| "the opposite: to inform them that all these system versions <em>are</em> "
+#| "versions of GNU, that they all are based on a system that exists "
+#| "specifically for the sake of the users' freedom.  With this "
+#| "understanding, they can start to recognize the distributions that include "
+#| "non-free software as perverted, adulterated versions of GNU, instead of "
+#| "thinking they are proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgid ""
 "The way to lead these users to see a connection with freedom is exactly the "
 "opposite: to inform them that all these system versions <em>are</em> "
 "versions of GNU, that they all are based on a system that exists "
 "specifically for the sake of the users' freedom.  With this understanding, "
-"they can start to recognize the distributions that include non-free software "
+"they can start to recognize the distributions that include nonfree software "
 "as perverted, adulterated versions of GNU, instead of thinking they are "
 "proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgstr ""
@@ -2401,7 +2476,7 @@
 "«versiones de Linux» correctas y apropiadas."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is very useful to start GNU/Linux User Groups, which call the system GNU/"
 "Linux and adopt the ideals of the GNU Project as a basis for their "
@@ -2420,7 +2495,7 @@
 "se deje arrastrar por ellos!"
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not make a GNU distribution of Linux (sic) and call that GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
@@ -2431,7 +2506,7 @@
 "span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "All the &ldquo;Linux&rdquo; distributions are actually versions of the GNU "
 "system with Linux as the kernel.  The purpose of the term &ldquo;GNU/"
@@ -2445,7 +2520,7 @@
 "solamente «GNU/Linux» dificultaría la comprensión de lo queremos 
transmitir."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "As for developing a distribution of GNU/Linux, we already did this once, "
 "when we funded the early development of Debian GNU/Linux.  To do it again "
@@ -2460,7 +2535,7 @@
 "distribuciones, no tendría sentido hacerlo."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Instead we help the developers of 100% free GNU/Linux distributions, such as "
 "gNewSense and Ututo."
@@ -2469,7 +2544,7 @@
 "100% libres, tales como gNewSense y Ututo."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not just say &ldquo;Linux is the GNU kernel&rdquo; and release some "
 "existing version of GNU/Linux under the name &ldquo;GNU&rdquo;? <span class="
@@ -2480,7 +2555,7 @@
 "\"anchor-reference-id\">(<a href=\"#linuxgnu\">#linuxgnu</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It might have been a good idea to adopt Linux as the GNU kernel back in "
 "1992.  If we had realized, then, how long it would take to get the GNU Hurd "
@@ -2492,7 +2567,7 @@
 "hecho. (Por desgracia, no podemos volver atrás)."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we were to take an existing version of GNU/Linux and relabel it as &ldquo;"
 "GNU&rdquo;, that would be somewhat like making a version of the GNU system "
@@ -2504,7 +2579,7 @@
 "«Linux». No sería correcto, y no queremos actuar así."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Did the GNU Project condemn and oppose use of Linux in the early days? <span "
 "class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
@@ -2513,7 +2588,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We did not adopt Linux as our kernel, but we didn't condemn or oppose it.  "
 "In 1993 we started discussing the arrangements to sponsor the development of "
@@ -2533,7 +2608,7 @@
 "hoc y no portables; para instalarlas antes había que limpiarlas."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who had made the changes showed little interest in cooperating "
 "with us.  One of them actually told us that he didn't care about working "
@@ -2553,7 +2628,7 @@
 "prácticamente el único)  que no quería trabajar con nosotros."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It was this experience that first showed us that people were calling a "
 "version of the GNU system &ldquo;Linux&rdquo;, and that this confusion was "
@@ -2568,7 +2643,7 @@
 "sistema se le llame «GNU/Linux»."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why did you wait so long before asking people to use the name GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
@@ -2578,7 +2653,7 @@
 "</span>"
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually we didn't.  We began talking privately with developers and "
 "distributors about this in 1994, and made a more public campaign in 1996.  "
@@ -2589,7 +2664,7 @@
 "1996. Continuaremos haciéndolo mientras sea necesario."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should the GNU/<i>name</i> convention be applied to all programs that are "
 "GPL'ed? <span class=\"anchor-reference-id\">(<a href=\"#allgpled"
@@ -2600,7 +2675,7 @@
 "\">#allgpled</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We never refer to individual programs as &ldquo;GNU/<i>name</i>&rdquo;.  "
 "When a program is a GNU package, we may call it &ldquo;GNU <i>name</"
@@ -2610,7 +2685,7 @@
 "programa es un paquete de GNU, podemos llamarlo «GNU [nombre]»."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU, the operating system, is made up of many different programs.  Some of "
 "the programs in GNU were written as part of the GNU Project or specifically "
@@ -2623,7 +2698,7 @@
 "usar «GNU» en sus nombres."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It's up to the developers of a program to decide if they want to contribute "
 "it and make it a GNU package.  If you have developed a program and you would "
@@ -2638,7 +2713,7 @@
 "decidir si lo adoptamos."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It wouldn't be fair to put the name GNU on every individual program that is "
 "released under the GPL.  If you write a program and release it under the "
@@ -2658,7 +2733,7 @@
 "no puede atribuírselo, y poner «GNU» en su nombre sería impropio."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In contrast, we do deserve the overall credit for the GNU operating system "
 "as a whole, even though not for each and every program in it.  The system "
@@ -2671,7 +2746,7 @@
 "y perseverancia, desde 1984, muchos años antes del comienzo de Linux."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The operating system in which Linux became popular was basically the same as "
 "the GNU operating system.  It was not entirely the same, because it had a "
@@ -2684,7 +2759,7 @@
 "variante de GNU. Era el sistema GNU/Linux."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux continues to be used primarily in derivatives of that system&mdash;in "
 "today's versions of the GNU/Linux system.  What gives these systems their "
@@ -2697,7 +2772,7 @@
 "en particular."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since much of GNU comes from Unix, shouldn't GNU give credit to Unix by "
 "using &ldquo;Unix&rdquo; in its name? <span class=\"anchor-reference-id\">"
@@ -2708,7 +2783,7 @@
 "reference-id\">(<a href=\"#unix\">#unix</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Actually, none of GNU comes from Unix.  Unix was proprietary software (and "
 "still is), so using any of its code in GNU would have been illegal.  This is "
@@ -2726,7 +2801,7 @@
 "ellos; había que escribirlo todo desde cero."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "No code in GNU comes from Unix, but GNU is a Unix-compatible system; "
 "therefore, many of the ideas and specifications of GNU do come from Unix.  "
@@ -2741,13 +2816,29 @@
 "tradición hacker de acrónimos recursivos que comenzó en los años setenta."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.
+# |  The author of TINT wrote another implementation of TECO (there were
+# | already many of them, for various systems), but instead of calling it by a
+# | dull name like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of
+# | a clever amusing name.  (That's what hacking means: <a
+# | href=\"http{+s+}://stallman.org/articles/on-hacking.html\">playful
+# | cleverness</a>.)
+#, fuzzy
+#| msgid ""
+#| "The first such recursive acronym was TINT, &ldquo;TINT Is Not "
+#| "TECO&rdquo;.  The author of TINT wrote another implementation of TECO "
+#| "(there were already many of them, for various systems), but instead of "
+#| "calling it by a dull name like &ldquo;<em>somethingorother</em> "
+#| "TECO&rdquo;, he thought of a clever amusing name.  (That's what hacking "
+#| "means: <a href=\"http://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
 "The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
 "The author of TINT wrote another implementation of TECO (there were already "
 "many of them, for various systems), but instead of calling it by a dull name "
 "like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of a clever "
-"amusing name.  (That's what hacking means: <a href=\"http://stallman.org/";
+"amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
 "El primer acrónimo recursivo como tal fue TINT, «<cite>TINT Is Not TECO</"
@@ -2758,7 +2849,7 @@
 "stallman.org/articles/on-hacking.html\">inteligencia lúdica</a>.)"
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Other hackers enjoyed that name so much that we imitated the approach.  It "
 "became a tradition that, when you were writing from scratch a program that "
@@ -2776,7 +2867,7 @@
 "cite>» (GNU No es Unix)."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Historically, AT&amp;T which developed Unix did not want anyone to give it "
 "credit by using &ldquo;Unix&rdquo; in the name of a similar system, not even "
@@ -2793,7 +2884,7 @@
 "un nombre completamente distinto que no incluía «Unix»."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we say &ldquo;GNU/BSD&rdquo; too? <span class=\"anchor-reference-id\">"
 "(<a href=\"#bsd\">#bsd</a>)</span>"
@@ -2802,7 +2893,7 @@
 "href=\"#bsd\">#bsd</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems, "
 "because that term does not fit the history of the BSD systems."
@@ -2811,9 +2902,19 @@
 "esa denominación no se ajusta a la historia de los sistemas BSD."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The BSD system was developed by UC Berkeley as non[---]free software in
+# | the 80s, and became free in the early 90s.  A free operating system that
+# | exists today is almost certainly either a variant of the GNU system, or a
+# | kind of BSD system.
+#, fuzzy
+#| msgid ""
+#| "The BSD system was developed by UC Berkeley as non-free software in the "
+#| "80s, and became free in the early 90s.  A free operating system that "
+#| "exists today is almost certainly either a variant of the GNU system, or a "
+#| "kind of BSD system."
 msgid ""
-"The BSD system was developed by UC Berkeley as non-free software in the 80s, "
+"The BSD system was developed by UC Berkeley as nonfree software in the 80s, "
 "and became free in the early 90s.  A free operating system that exists today "
 "is almost certainly either a variant of the GNU system, or a kind of BSD "
 "system."
@@ -2824,7 +2925,7 @@
 "seguridad una variante del sistema GNU o algún tipo de sistema BSD."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "People sometimes ask whether BSD too is a variant of GNU, as GNU/Linux is.  "
 "It is not.  The BSD developers were inspired to make their code free "
@@ -2839,7 +2940,7 @@
 "en común con GNU."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "BSD systems today use some GNU packages, just as the GNU system and its "
 "variants use some BSD programs; however, taken as wholes, they are two "
@@ -2854,7 +2955,7 @@
 "al sistema GNU, por lo que un nombre como GNU/BSD no encajaría en este caso."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The connection between GNU/Linux and GNU is much closer, and that's why the "
 "name &ldquo;GNU/Linux&rdquo; is appropriate for it."
@@ -2863,7 +2964,7 @@
 "«GNU/Linux» es apropiado."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is a version of GNU which uses the kernel from NetBSD.  Its developers "
 "call it &ldquo;Debian GNU/NetBSD&rdquo;, but &ldquo;GNU/"
@@ -2878,7 +2979,7 @@
 "sistema GNU/Linux."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "If I install the GNU tools on Windows, does that mean I am running a GNU/"
 "Windows system? <span class=\"anchor-reference-id\">(<a href=\"#othersys"
@@ -2889,7 +2990,7 @@
 "href=\"#othersys\">#othersys</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
 "GNU are just a part of the GNU software, which is just a part of the GNU "
@@ -2904,7 +3005,7 @@
 "situación muy distinta de GNU/Linux."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can't Linux be used without GNU? <span class=\"anchor-reference-id\">(<a "
 "href=\"#justlinux\">#justlinux</a>)</span>"
@@ -2912,7 +3013,7 @@
 "¿No puede utilizarse Linux sin GNU? <span class=\"anchor-reference-id\">(<a "
 "href=\"#justlinux\">#justlinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is used by itself, or with small other programs, in some appliances.  "
 "These small software systems are a far cry from the GNU/Linux system.  Users "
@@ -2928,7 +3029,7 @@
 "plataformas son muy diferentes de GNU/Linux."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How much of the GNU system is needed for the system to be GNU/Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
@@ -2937,7 +3038,7 @@
 "sistema para que sea GNU/Linux? <span class=\"anchor-reference-id\">(<a href="
 "\"#howmuch\">#howmuch</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "&ldquo;How much&rdquo; is not a meaningful question because the GNU system "
 "does not have precise boundaries."
@@ -2945,7 +3046,7 @@
 "«Qué cantidad» es una pregunta sin mucho sentido, ya que el sistema GNU no 
"
 "tiene unos límites precisos."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is an operating system maintained by a community.  It includes far more "
 "than just the GNU software packages (of which we have a specific list), and "
@@ -2961,7 +3062,7 @@
 "GNU/Linux. Si se utiliza parte del sistema GNU y se omite otra parte, no es "
 "posible precisar «qué cantidad» se ha utilizado."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we look at the level of packages, Linux is one important package in the "
 "GNU/Linux system.  The inclusion of one important GNU package is enough to "
@@ -2972,7 +3073,7 @@
 "suficiente para justificar nuestra petición de que se mencione por igual."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Are there complete Linux systems [sic] without GNU? <span class=\"anchor-"
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
@@ -2983,7 +3084,7 @@
 "span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There are complete systems that contain Linux and not GNU; Android is an "
 "example.  But it is a mistake to call them &ldquo;Linux&rdquo; systems, just "
@@ -2993,7 +3094,7 @@
 "pero es un error llamarlos sistemas «Linux», al igual que es un error decir 
"
 "que GNU es un sistema «Linux»."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android is very different from the GNU/Linux system&mdash;because the two "
 "have very little code in common.  In fact, the only thing they have in "
@@ -3002,7 +3103,7 @@
 "Android es muy diferente del sistema GNU/Linux porque ambos tienen muy poco "
 "código en común. De hecho, lo único que tienen en común es Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
 "necessary to say things like, &ldquo;Android contains Linux, but it isn't "
@@ -3014,7 +3115,7 @@
 "bibliotecas y herramientas [refiriéndose al sistema GNU] habituales de Linux 
"
 "[sic]». "
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android contains just as much of Linux as GNU/Linux does.  What it doesn't "
 "have is the GNU system.  Android replaces that with Google software that "
@@ -3027,7 +3128,7 @@
 "Linux es la ausencia de GNU."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Is it correct to say &ldquo;using Linux&rdquo; if it refers to using GNU/"
 "Linux and using Android? <span class=\"anchor-reference-id\">(<a href="
@@ -3039,7 +3140,7 @@
 "\"#usegnulinuxandandroidlinuxsyswithoutgnu"
 "\">#usegnulinuxandandroidlinuxsyswithoutgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Far from it.  That usage is so strained that people will not understand the "
 "intended meaning."
@@ -3047,7 +3148,7 @@
 "De ningún modo. Ese uso es tan forzado que la gente no entenderá lo que se "
 "quiere decir."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public will find it very strange to speak of using Android as &ldquo;"
 "using Linux&rdquo;.  It's like having a conversation, then saying you were "
@@ -3058,7 +3159,7 @@
 "ha estado conversando con los intestinos o el sistema circulatorio de la "
 "persona en cuestión."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public <em>will</em> understand the idea of &ldquo;using Linux&rdquo; "
 "when it's really GNU/Linux, by way of the usual misunderstanding: thinking "
@@ -3068,7 +3169,7 @@
 "realidad se trata de GNU/Linux, debido al malentendido habitual: pensar en "
 "que el sistema en conjunto es «Linux»."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Use of Android and use of GNU/Linux are totally different, as different as "
 "driving a car and riding a bicycle.  The fact that the first two both "
@@ -3091,7 +3192,7 @@
 "es decir «utilizar GNU/Linux y Android»."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not call the system &ldquo;Linux&rdquo; anyway, and strengthen Linus "
 "Torvalds' role as posterboy for our community? <span class=\"anchor-"
@@ -3102,7 +3203,7 @@
 "\"anchor-reference-id\">(<a href=\"#helplinus\">#helplinus</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Linus Torvalds is the &ldquo;posterboy&rdquo; (other people's choice of "
 "word, not ours) for his goals, not ours.  His goal is to make the system "
@@ -3121,12 +3222,30 @@
 "no vincula el nombre «Linux» con ese principio."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | Linus publicly states his disagreement with the free software movement's
+# | ideals.  He developed non[---]free software in his job for many years (and
+# | said so to a large audience at a &ldquo;Linux&rdquo;World show), and
+# | publicly invited fellow developers of Linux, the kernel, to use
+# | non[---]free software to work on it with him.  He goes even further, and
+# | rebukes people who suggest that engineers and scientists should consider
+# | social consequences of our technical work&mdash;rejecting the lessons
+# | society learned from the development of the atom bomb.
+#, fuzzy
+#| msgid ""
+#| "Linus publicly states his disagreement with the free software movement's "
+#| "ideals.  He developed non-free software in his job for many years (and "
+#| "said so to a large audience at a &ldquo;Linux&rdquo;World show), and "
+#| "publicly invited fellow developers of Linux, the kernel, to use non-free "
+#| "software to work on it with him.  He goes even further, and rebukes "
+#| "people who suggest that engineers and scientists should consider social "
+#| "consequences of our technical work&mdash;rejecting the lessons society "
+#| "learned from the development of the atom bomb."
 msgid ""
 "Linus publicly states his disagreement with the free software movement's "
-"ideals.  He developed non-free software in his job for many years (and said "
+"ideals.  He developed nonfree software in his job for many years (and said "
 "so to a large audience at a &ldquo;Linux&rdquo;World show), and publicly "
-"invited fellow developers of Linux, the kernel, to use non-free software to "
+"invited fellow developers of Linux, the kernel, to use nonfree software to "
 "work on it with him.  He goes even further, and rebukes people who suggest "
 "that engineers and scientists should consider social consequences of our "
 "technical work&mdash;rejecting the lessons society learned from the "
@@ -3143,7 +3262,7 @@
 "aprendido a partir del desarrollo de la bomba atómica."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with writing a free program for the motivations of "
 "learning and having fun; the kernel Linus wrote for those reasons was an "
@@ -3164,7 +3283,7 @@
 "la libertad, no de sus puntos de vista."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong for us to label Linus Torvalds' work as GNU? <span class="
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
@@ -3174,7 +3293,7 @@
 "\">#claimlinux</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong, so we don't do that.  Torvalds' work is Linux, the "
 "kernel; we are careful not to attribute that work to the GNU Project or "
@@ -3187,7 +3306,7 @@
 "denominación «GNU/Linux» le da una parte del reconocimiento."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Does Linus Torvalds agree that Linux is just the kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
@@ -3196,10 +3315,23 @@
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | He recognized this at the beginning.  The earliest Linux release notes
+# | said, <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | &ldquo;Most of the tools used with linux are GNU software and are under
+# | the GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
+# |  for more info&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
+#| "versions/RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are "
+#| "GNU software and are under the GNU copyleft. These tools aren't in the "
+#| "distribution - ask me (or GNU)  for more info&rdquo;</a>."
 msgid ""
 "He recognized this at the beginning.  The earliest Linux release notes said, "
-"<a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"<a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
 "RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are GNU software "
 "and are under the GNU copyleft. These tools aren't in the distribution - ask "
 "me (or GNU)  for more info&rdquo;</a>."
@@ -3212,7 +3344,7 @@
 "(texto en inglés)."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not finish the GNU Hurd kernel, release the GNU system as a whole, and "
 "forget the question of what to call GNU/Linux? <span class=\"anchor-"
@@ -3222,7 +3354,7 @@
 "y olvidarse del problema de cómo llamar a GNU/Linux?<span class=\"anchor-"
 "reference-id\">(<a href=\"#finishhurd\">#finishhurd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We would like credit for the GNU operating system no matter which kernel is "
 "used with it."
@@ -3230,13 +3362,27 @@
 "Quisiéramos obtener reconocimiento por el sistema operativo GNU, "
 "independientemente del núcleo que se utilice con él."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | Making the GNU Hurd work well enough to compete with Linux would be a big
+# | job, and it's not clearly necessary.  The only thing ethically wrong with
+# | Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the
+# | best fix for that problem is <a
+# | [-href=\"http://fsf.org/campaigns/priority-projects\";>-]
+# | {+href=\"https://www.fsf.org/campaigns/priority-projects\";>+} developing
+# | free replacement for the blobs</a>.
+#, fuzzy
+#| msgid ""
+#| "Making the GNU Hurd work well enough to compete with Linux would be a big "
+#| "job, and it's not clearly necessary.  The only thing ethically wrong with "
+#| "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the "
+#| "best fix for that problem is <a href=\"http://fsf.org/campaigns/priority-";
+#| "projects\"> developing free replacement for the blobs</a>."
 msgid ""
 "Making the GNU Hurd work well enough to compete with Linux would be a big "
 "job, and it's not clearly necessary.  The only thing ethically wrong with "
 "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the best "
-"fix for that problem is <a href=\"http://fsf.org/campaigns/priority-projects";
-"\"> developing free replacement for the blobs</a>."
+"fix for that problem is <a href=\"https://www.fsf.org/campaigns/priority-";
+"projects\"> developing free replacement for the blobs</a>."
 msgstr ""
 "Hacer que el Hurd de GNU funcionara lo suficientemente bien como para "
 "competir con Linux requeriría mucho trabajo, y no es evidente que sea "
@@ -3247,7 +3393,7 @@
 "cite></a>."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The battle is already lost&mdash;society has made its decision and we can't "
 "change it, so why even think about it? <span class=\"anchor-reference-id\">"
@@ -3258,7 +3404,7 @@
 "reference-id\">(<a href=\"#lost\">#lost</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This isn't a battle, it is a campaign of education.  What to call the system "
 "is not a single decision, to be made at one moment by &ldquo;society&rdquo;: "
@@ -3274,7 +3420,7 @@
 "al sistema «GNU/Linux», ya al hacerlo contribuirá a instruir a los demás."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Society has made its decision and we can't change it, so what good does it "
 "do if I say &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id\">(<a "
@@ -3285,7 +3431,7 @@
 "\"#whatgood\">#whatgood</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is not an all-or-nothing situation: correct and incorrect pictures are "
 "being spread more or less by various people.  If you call the system &ldquo;"
@@ -3307,7 +3453,7 @@
 "más gente."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to call the system &ldquo;Linux&rdquo; and teach "
 "people its real origin with a ten-minute explanation? <span class=\"anchor-"
@@ -3318,7 +3464,7 @@
 "\"#explain\">#explain</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "If you help us by explaining to others in that way, we appreciate your "
 "effort, but that is not the best method.  It is not as effective as calling "
@@ -3329,7 +3475,7 @@
 "Linux», y emplea su tiempo de manera poco eficiente."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is ineffective because it may not sink in, and surely will not "
 "propagate.  Some of the people who hear your explanation will pay attention, "
@@ -3346,7 +3492,7 @@
 "difundirán la imagen equivocada."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is inefficient because it takes a lot more time.  Saying and writing "
 "&ldquo;GNU/Linux&rdquo; will take you only a few seconds a day, not minutes, "
@@ -3361,7 +3507,7 @@
 "ayudar eficazmente al Proyecto GNU."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people laugh at you when you ask them to call the system GNU/Linux.  "
 "Why do you subject yourself to this treatment? <span class=\"anchor-"
@@ -3372,7 +3518,7 @@
 "href=\"#treatment\">#treatment</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; tends to give people a mistaken "
 "picture of the system's history and reason for existence.  People who laugh "
@@ -3387,7 +3533,7 @@
 "supieran la verdad, probablemente no se reirían."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Why do we take the risk of making a request that sometimes leads people to "
 "ridicule us? Because often it has useful results that help the GNU Project.  "
@@ -3399,7 +3545,7 @@
 "de que se nos trate inmerecidamente."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you see such an ironically unfair situation occurring, please don't sit "
 "idly by.  Please teach the laughing people the real history.  When they see "
@@ -3411,7 +3557,7 @@
 "juicio dejarán de reírse."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people condemn you when you ask them to call the system GNU/Linux.  "
 "Don't you lose by alienating them? <span class=\"anchor-reference-id\">(<a "
@@ -3422,7 +3568,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#alienate\">#alienate</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not much.  People who don't appreciate our role in developing the system are "
 "unlikely to make substantial efforts to help us.  If they do work that "
@@ -3440,7 +3586,7 @@
 "conseguir la ayuda de otros."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It makes no sense to worry about alienating people who are already mostly "
 "uncooperative, and it is self-defeating to be deterred from correcting a "
@@ -3454,7 +3600,7 @@
 "corregir el error."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Whatever you contributed, is it legitimate to rename the operating system? "
 "<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
@@ -3464,7 +3610,7 @@
 "a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are not renaming anything; we have been calling this system &ldquo;"
 "GNU&rdquo; ever since we announced it in 1983.  The people who tried to "
@@ -3475,7 +3621,7 @@
 "cambiar el nombre por «Linux» quienes no deberían haberlo hecho."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong to force people to call the system &ldquo;GNU/Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
@@ -3484,7 +3630,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong to force them, and we don't try.  We call the system "
 "&ldquo;GNU/Linux&rdquo;, and we ask you to do it too."
@@ -3493,7 +3639,7 @@
 "«GNU/Linux» y simplemente le pedimos a usted que haga lo mismo."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not sue people who call the whole system &ldquo;Linux&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
@@ -3502,7 +3648,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are no legal grounds to sue them, but since we believe in freedom of "
 "speech, we wouldn't want to do that anyway.  We ask people to call the "
@@ -3513,7 +3659,7 @@
 "llame «GNU/Linux» al sistema porque es lo correcto."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Shouldn't you put something in the GNU GPL to require people to call the "
 "system &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id\">(<a href="
@@ -3524,13 +3670,31 @@
 "\">#require</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
+# | The purpose of the GNU GPL is to protect the users' freedom from those who
+# | would make proprietary versions of free software.  While it is true that
+# | those who call the system &ldquo;Linux&rdquo; often do things that limit
+# | the users' freedom, such as bundling non[---]free software with the
+# | GNU/Linux system or even developing non[---]free software for such use,
+# | the mere act of calling the system &ldquo;Linux&rdquo; does not, in
+# | itself, deny users their freedom.  It seems improper to make the GPL
+# | restrict what name people can use for the system.
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU GPL is to protect the users' freedom from those "
+#| "who would make proprietary versions of free software.  While it is true "
+#| "that those who call the system &ldquo;Linux&rdquo; often do things that "
+#| "limit the users' freedom, such as bundling non-free software with the GNU/"
+#| "Linux system or even developing non-free software for such use, the mere "
+#| "act of calling the system &ldquo;Linux&rdquo; does not, in itself, deny "
+#| "users their freedom.  It seems improper to make the GPL restrict what "
+#| "name people can use for the system."
 msgid ""
 "The purpose of the GNU GPL is to protect the users' freedom from those who "
 "would make proprietary versions of free software.  While it is true that "
 "those who call the system &ldquo;Linux&rdquo; often do things that limit the "
-"users' freedom, such as bundling non-free software with the GNU/Linux system "
-"or even developing non-free software for such use, the mere act of calling "
+"users' freedom, such as bundling nonfree software with the GNU/Linux system "
+"or even developing nonfree software for such use, the mere act of calling "
 "the system &ldquo;Linux&rdquo; does not, in itself, deny users their "
 "freedom.  It seems improper to make the GPL restrict what name people can "
 "use for the system."
@@ -3545,7 +3709,7 @@
 "limite los nombres que la gente puede utilizar para el sistema."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you objected to the original BSD license's advertising requirement to "
 "give credit to the University of California, isn't it hypocritical to demand "
@@ -3558,7 +3722,7 @@
 "reference-id\">(<a href=\"#BSDlicense\">#BSDlicense</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would be hypocritical to make the name GNU/Linux a license requirement, "
 "and we don't.  We only <em>ask</em> you to give us the credit we deserve."
@@ -3567,7 +3731,7 @@
 "licencia, y no lo hacemos. Únicamente <em>pedimos</em> que se nos dé el "
 "reconocimiento que merecemos."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please note that there are at least <a href=\"/licenses/bsd.html\"> two "
 "different BSD licenses</a>.  For clarity's sake, please don't use the term "
@@ -3578,7 +3742,7 @@
 "expresión «licencia BSD» sin especificar a cuál se refiere. "
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you failed to put something in the GNU GPL to require people to call "
 "the system &ldquo;GNU&rdquo;, you deserve what happened; why are you "
@@ -3591,7 +3755,7 @@
 "a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The question presupposes a rather controversial general ethical premise: "
 "that if people do not force you to treat them fairly, you are entitled to "
@@ -3604,12 +3768,12 @@
 "por sentado que la fuerza hace el derecho."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope you disagree with that premise just as we do."
 msgstr "Esperamos que, al igual que nosotros, no acepte esa premisa."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't you be better off not contradicting what so many people believe? "
 "<span class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)"
@@ -3620,7 +3784,7 @@
 "span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't think we should go along with large numbers of people because they "
 "have been misled.  We hope you too will decide that truth is important."
@@ -3630,7 +3794,7 @@
 "importante."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We could never have developed a free operating system without first denying "
 "the belief, held by most people, that proprietary software was legitimate "
@@ -3641,7 +3805,7 @@
 "legítimo y aceptable."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
 "<span class=\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</"
@@ -3652,12 +3816,12 @@
 "\">#somanyright</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "We don't think that the popularity of an error makes it the truth."
 msgstr "No creemos que la popularidad de un error lo convierta en una verdad."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it better to call the system by the name most users already know? "
 "<span class=\"anchor-reference-id\">(<a href=\"#knownname\">#knownname</a>)</"
@@ -3667,7 +3831,7 @@
 "usuarios ya conocen?<span class=\"anchor-reference-id\">(<a href=\"#knownname"
 "\">#knownname</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo; includes "
 "&ldquo;Linux&rdquo;, they will recognize what you're talking about.  If you "
@@ -3680,7 +3844,7 @@
 "Linux&rsquo;)», todos lo comprenderán."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many people care about what's convenient or who's winning, not about "
 "arguments of right or wrong.  Couldn't you get more of their support by a "
@@ -3693,12 +3857,24 @@
 "\">#winning</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+# | To care only about what's convenient or who's winning is an amoral
+# | approach to life.  Non[---]free software is an example of that amoral
+# | approach and thrives on it.  Thus, in the long run it would be
+# | self-defeating for us to adopt that approach.  We will continue talking in
+# | terms of right and wrong.
+#, fuzzy
+#| msgid ""
+#| "To care only about what's convenient or who's winning is an amoral "
+#| "approach to life.  Non-free software is an example of that amoral "
+#| "approach and thrives on it.  Thus, in the long run it would be self-"
+#| "defeating for us to adopt that approach.  We will continue talking in "
+#| "terms of right and wrong."
 msgid ""
 "To care only about what's convenient or who's winning is an amoral approach "
-"to life.  Non-free software is an example of that amoral approach and "
-"thrives on it.  Thus, in the long run it would be self-defeating for us to "
-"adopt that approach.  We will continue talking in terms of right and wrong."
+"to life.  Nonfree software is an example of that amoral approach and thrives "
+"on it.  Thus, in the long run it would be self-defeating for us to adopt "
+"that approach.  We will continue talking in terms of right and wrong."
 msgstr ""
 "Tener en cuenta únicamente lo práctico o quién es el ganador es un enfoque 
"
 "amoral de la vida. El software que no es libre es un ejemplo de ese enfoque "
@@ -3707,7 +3883,7 @@
 "bien y lo que está mal."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope that you are one of those for whom right and wrong do matter."
 msgstr ""
 "Esperamos que usted sea uno de esos a quienes importa lo correcto e "
@@ -3763,14 +3939,18 @@
 "\">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>
+# | Copyright &copy; [-2014, 2015, 2016, 2017, 2018-] {+2001-2011, 2013-2018,
+# | 2020, 2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, "
+#| "Inc."
 msgid ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation, "
+"Inc."
 msgstr ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -3795,3 +3975,11 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Última actualización:"
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
+#~ "Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
+#~ "Free Software Foundation, Inc."

Index: gnu/po/gnu-linux-faq.fr.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.fr.po,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- gnu/po/gnu-linux-faq.fr.po  4 Jul 2021 18:22:45 -0000       1.124
+++ gnu/po/gnu-linux-faq.fr.po  30 Aug 2021 13:34:52 -0000      1.125
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-07-04 20:19+0200\n"
 "Last-Translator: Sogal <sogal AT member.fsf.org>\n"
 "Language-Team: French <trad-gnu@april.org>\n"
@@ -18,6 +18,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -25,28 +26,15 @@
 msgid "GNU/Linux FAQ - GNU Project - Free Software Foundation"
 msgstr "FAQ sur GNU/Linux - Projet GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU/Linux FAQ"
 msgstr "FAQ sur GNU/Linux"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by Richard Stallman"
 msgstr "par Richard Stallman"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
-"linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a href=\"/"
-"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Pour en savoir plus, voir aussi les pages suivantes : <a href=\"/gnu/linux-"
-"and-gnu.html\">Linux et le projet GNU</a>, <a href=\"/gnu/why-gnu-linux.html"
-"\">Pourquoi GNU/Linux ?</a> et <a href=\"/gnu/gnu-users-never-heard-of-gnu."
-"html\">Les utilisateurs de GNU qui n'ont jamais entendu parler de GNU</a>."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When people see that we use and recommend the name GNU/Linux for a system "
 "that many others call just &ldquo;Linux&rdquo;, they ask many questions.  "
@@ -57,6 +45,13 @@
 "posent beaucoup de questions. Voici les plus communes d'entre elles, et nos "
 "réponses."
 
+#. type: Content of: <div><div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "Table des matières"
+
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<a href=\"#why\">Why do you call the system we use GNU/Linux and not Linux?</"
@@ -667,7 +662,33 @@
 "pratique ou le gagnant de la compétition, pas les questions de bien ou de "
 "mal. Ne pourriez-vous pas obtenir leur soutien par d'autres moyens ?</a>"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
+# | {+System</a>,+} our page on <a href=\"/gnu/why-gnu-linux.html\">Why
+# | GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our page on <a href=\"/"
+#| "gnu/linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a "
+#| "href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
+"linux-and-gnu.html\">Linux and the GNU System</a>, our page on <a href=\"/"
+"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Pour en savoir plus, voir aussi les pages suivantes : <a href=\"/gnu/linux-"
+"and-gnu.html\">Linux et le projet GNU</a>, <a href=\"/gnu/why-gnu-linux.html"
+"\">Pourquoi GNU/Linux ?</a> et <a href=\"/gnu/gnu-users-never-heard-of-gnu."
+"html\">Les utilisateurs de GNU qui n'ont jamais entendu parler de GNU</a>."
+
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you call the system we use GNU/Linux and not Linux? <span class="
 "\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>"
@@ -675,7 +696,7 @@
 "Pourquoi appelez-vous le système que nous utilisons GNU/Linux et pas Linux 
? "
 "<span class=\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Most operating system distributions based on Linux as kernel are basically "
 "modified versions of the GNU operating system.  We began developing GNU in "
@@ -695,12 +716,12 @@
 "contribution unique la plus importante au système complet. L'idée de base "
 "était également la nôtre."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "In fairness, we ought to get at least equal mention."
 msgstr ""
 "En toute justice, nous devrions avoir au moins une mention équivalente."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and the GNU System</a> and <a "
 "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
@@ -712,7 +733,7 @@
 "n'ont jamais entendu parler de GNU</a> pour plus d'informations, et <a href="
 "\"/gnu/the-gnu-project.html\">Le projet GNU</a> pour l'historique."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why is the name important? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
@@ -720,7 +741,7 @@
 "Pourquoi le nom est-il important ? <span class=\"anchor-reference-id\">(<a "
 "href=\"#whycare\">#whycare</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Although the developers of Linux, the kernel, are contributing to the free "
 "software community, many of them do not care about freedom.  People who "
@@ -735,7 +756,7 @@
 "communauté qu'ils n'ont pas joué en réalité. De cette manière, ils 
donnent "
 "un poids inapproprié aux points de vue de ces développeurs."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Calling the system GNU/Linux recognizes the role that our idealism played in "
 "building our community, and <a href=\"/gnu/why-gnu-linux.html\">helps the "
@@ -745,7 +766,7 @@
 "dans la construction de notre communauté et <a 
href=\"/gnu/why-gnu-linux.html"
 "\">aide le public à reconnaître l'importance pratique de ces idéaux</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the real relationship between GNU and Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#what\">#what</a>)</span>"
@@ -753,7 +774,7 @@
 "Quelle est la relation exacte entre GNU et Linux ? <span class=\"anchor-"
 "reference-id\">(<a href=\"#what\">#what</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU operating system and the Linux kernel are separate software projects "
 "that do complementary jobs.  Typically they are packaged in a <a href=\"/"
@@ -764,7 +785,7 @@
 "dans une <a href=\"/distros/distros.html\">distribution GNU/Linux</a> et "
 "utilisés ensemble."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How did it come about that most people call the system &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
@@ -774,7 +795,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; is a confusion that has spread faster "
 "than the corrective information."
@@ -782,7 +803,7 @@
 "Appeler le système « Linux » provient d'une confusion qui s'est 
propagée "
 "plus vite que la rectification."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who combined Linux with the GNU system were not aware that that's "
 "what their activity amounted to.  They focused their attention on the piece "
@@ -801,7 +822,7 @@
 "gens de corriger cette habitude. À ce moment-là, la confusion avait déjà 
une "
 "bonne longueur d'avance."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the people who call the system &ldquo;Linux&rdquo; have never heard "
 "why that's not the right thing.  They saw others using that name and assume "
@@ -820,7 +841,7 @@
 "Linus Torvalds en 1991. Cette image faussée tend à renforcer l'idée que le 
"
 "système doit être appelé « Linux »."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Many of the questions in this file represent people's attempts to justify "
 "the name they are accustomed to using."
@@ -828,7 +849,7 @@
 "Beaucoup des questions de cette page représentent les tentatives faites par "
 "les gens pour justifier le nom qu'ils ont l'habitude d'utiliser."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we always say &ldquo;GNU/Linux&rdquo; instead of &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
@@ -836,7 +857,7 @@
 "Faut-il toujours utiliser le nom « GNU/Linux » à la place de « Linux 
» ? "
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not always&mdash;only when you're talking about the whole system.  When "
 "you're referring specifically to the kernel, you should call it &ldquo;"
@@ -846,7 +867,7 @@
 "faites référence spécifiquement au noyau, vous devez l'appeler « Linux 
», le "
 "nom que son développeur a choisi."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
 "call the whole system by the same name as the kernel.  This causes many "
@@ -861,7 +882,7 @@
 "appelant le système entier « GNU/Linux » et en appelant le noyau « 
Linux », "
 "vous évitez l'ambiguïté."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Would Linux have achieved the same success if there had been no GNU? <span "
 "class=\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</"
@@ -871,7 +892,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In that alternative world, there would be nothing today like the GNU/Linux "
 "system, and probably no free operating system at all.  No one attempted to "
@@ -886,7 +907,7 @@
 "\"Computer Systems Research Group\">CSRG</abbr>, à qui le projet GNU a "
 "spécifiquement demandé de commencer à libérer son code."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds was partly influenced by a speech about GNU in Finland in "
 "1990.  It's possible that even without this influence he might have written "
@@ -900,7 +921,7 @@
 "Linux devint libre en 1992 quand Linus l'a republié sous la licence GNU GPL "
 "(voir les notes de distribution de la version 0.12)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Even if Torvalds had released Linux under some other free software license, "
 "a free kernel alone would not have made much difference to the world.  The "
@@ -913,7 +934,7 @@
 "place dans un cadre plus large, un système d'exploitation complètement "
 "libre : GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better for the community if you did not divide people with "
 "this request? <span class=\"anchor-reference-id\">(<a href=\"#divide"
@@ -923,7 +944,7 @@
 "avec cette demande ? <span class=\"anchor-reference-id\">(<a href=\"#divide"
 "\">#divide</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
 "people.  We are asking them to give the GNU Project credit for the GNU "
@@ -933,7 +954,7 @@
 "les gens. Nous leur demandons de reconnaître la contribution du projet GNU "
 "au système GNU. Cela ne critique personne ni ne rejette personne."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, there are people who do not like our saying this.  Sometimes those "
 "people push us away in response.  On occasion they are so rude that one "
@@ -948,7 +969,7 @@
 "nous fait pas taire, mais cela tend à diviser la communauté, donc nous "
 "espérons que vous pourrez les convaincre de cesser."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, this is only a secondary cause of division in our community.  The "
 "largest division in the community is between people who appreciate free "
@@ -966,7 +987,7 @@
 "pratiques et présentent le logiciel libre uniquement comme un modèle de "
 "développement efficace (le mouvement open source)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This disagreement is not just a matter of names&mdash;it is a matter of "
 "differing basic values.  It is essential for the community to see and think "
@@ -982,7 +1003,7 @@
 "href=\"/philosophy/open-source-misses-the-point.html\">En quoi l'open source "
 "perd de vue l'éthique du logiciel libre</a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The disagreement over values partially aligns with the amount of attention "
 "people pay to the GNU Project's role in our community.  People who value "
@@ -1008,7 +1029,7 @@
 "l'importance à la liberté, persuadons tout le monde (ce qui ne sera pas "
 "facile) ou que nous soyons complètement vaincus (espérons que non)."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Doesn't the GNU project support an individual's free speech rights to call "
 "the system by any name that individual chooses? <span class=\"anchor-"
@@ -1019,7 +1040,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#freespeech\">#freespeech</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Yes, indeed, we believe you have a free speech right to call the operating "
 "system by any name you wish.  We ask that people call it GNU/Linux as a "
@@ -1033,7 +1054,7 @@
 "valeurs de liberté que GNU représente et pour informer les autres que ces "
 "valeurs de liberté ont fait naître ce système."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since everyone knows the role of GNU in developing the system, doesn't the "
 "&ldquo;GNU/&rdquo; in the name go without saying? <span class=\"anchor-"
@@ -1044,7 +1065,7 @@
 "\"anchor-reference-id\">(<a href=\"#everyoneknows\">#everyoneknows</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Experience shows that the system's users, and the computer-using public in "
 "general, often know nothing about the GNU system.  Most articles about the "
@@ -1059,7 +1080,7 @@
 "\">Les utilisateurs de GNU qui n'ont jamais entendu parler de GNU</a> donne "
 "des explications complémentaires à ce sujet."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who say this are probably geeks thinking of the geeks they know.  "
 "Geeks often do know about GNU, but many have a completely wrong idea of what "
@@ -1073,7 +1094,7 @@
 "d'« <a href=\"#tools\">outils</a> », ou d'un projet pour développer des "
 "outils."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The wording of this question, which is typical, illustrates another common "
 "misconception.  To speak of &ldquo;GNU's role&rdquo; in developing something "
@@ -1087,7 +1108,7 @@
 "personnes. GNU est un système d'exploitation. Cela aurait du sens de parler "
 "du rôle du projet GNU dans telle ou telle activité, mais pas de celui de 
GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since I know the role of GNU in this system, why does it matter what name I "
 "use? <span class=\"anchor-reference-id\">(<a href="
@@ -1097,7 +1118,7 @@
 "j'utilise est-il important ? <span class=\"anchor-reference-id\">(<a href="
 "\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your words don't reflect your knowledge, you don't teach others.  Most "
 "people who have heard of the GNU/Linux system think it is &ldquo;"
@@ -1110,7 +1131,7 @@
 "été initié par Linus Torvalds et qu'il était destiné à être « open 
source ». "
 "Si vous ne les détrompez pas, qui le fera ?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't shortening &ldquo;GNU/Linux&rdquo; to &ldquo;Linux&rdquo; just like "
 "shortening &ldquo;Microsoft Windows&rdquo; to &ldquo;Windows&rdquo;? <span "
@@ -1120,7 +1141,7 @@
 "l'abréviation de « Microsoft Windows » en « Windows » ? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#windows\">#windows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It's useful to shorten a frequently-used name, but not if the abbreviation "
 "is misleading."
@@ -1128,7 +1149,7 @@
 "Il est utile de raccourcir un nom fréquemment utilisé, mais pas si "
 "l'abréviation est trompeuse."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Almost everyone in developed countries really does know that the &ldquo;"
 "Windows&rdquo; system is made by Microsoft, so shortening &ldquo;Microsoft "
@@ -1142,7 +1163,7 @@
 "Abréger « GNU/Linux » en « Linux » donne par contre une idée fausse 
de "
 "l'origine du système."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The question is itself misleading because GNU and Microsoft are not the same "
 "kind of thing.  Microsoft is a company; GNU is an operating system."
@@ -1150,7 +1171,7 @@
 "La question elle-même est trompeuse puisque GNU et Microsoft ne sont pas de "
 "même nature. Microsoft est une entreprise, GNU est un système 
d'exploitation."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't GNU a collection of programming tools that were included in Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
@@ -1159,7 +1180,7 @@
 "intégrée dans Linux ? <span class=\"anchor-reference-id\">(<a 
href=\"#tools"
 "\">#tools</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "People who think that Linux is an entire operating system, if they hear "
 "about GNU at all, often get a wrong idea of what GNU is.  They may think "
@@ -1178,7 +1199,7 @@
 "dans un cadre conceptuel dans lequel le système d'exploitation est 
étiqueté "
 "« Linux »."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Project was named after the GNU operating system&mdash;it's the "
 "project to develop the GNU system.  (See <a href=\"/gnu/initial-announcement."
@@ -1188,7 +1209,7 @@
 "c'est le projet de développer le système GNU (voir <a href=\"/gnu/initial-"
 "announcement.html\">l'annonce initiale de 1983</a>)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We developed programs such as GCC, GNU Emacs, GAS, GLIBC, BASH, etc., "
 "because we needed them for the GNU operating system.  GCC, the GNU Compiler "
@@ -1204,7 +1225,7 @@
 "travaillant sur le projet GNU, avons aussi développé Ghostscript, GNUCash, "
 "GNU Chess et GNOME pour le système GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the difference between an operating system and a kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
@@ -1213,7 +1234,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "An operating system, as we use the term, means a collection of programs that "
 "are sufficient to use the computer to do a wide variety of jobs.  A general "
@@ -1226,7 +1247,7 @@
 "complet, devrait être capable de réaliser toutes les tâches qu'un grand "
 "nombre d'utilisateurs peuvent souhaiter effectuer."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The kernel is one of the programs in an operating system&mdash;the program "
 "that allocates the machine's resources to the other programs that are "
@@ -1237,7 +1258,7 @@
 "même temps. Le noyau s'occupe également de lancer et d'arrêter les autres "
 "programmes."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "To confuse matters, some people use the term &ldquo;operating system&rdquo; "
 "to mean &ldquo;kernel&rdquo;.  Both uses of the term go back many years.  "
@@ -1259,7 +1280,7 @@
 "d'exploitation similaire à Unix, nous avons utilisé le terme « système "
 "d'exploitation » de la même manière."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the time when people speak of the &ldquo;Linux operating "
 "system&rdquo; they are using &ldquo;operating system&rdquo; in the same "
@@ -1277,7 +1298,7 @@
 "s'il vous plaît « noyau » pour éviter toute ambiguïté sur l'élément 
de "
 "logiciel dont vous parlez."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
@@ -1289,7 +1310,7 @@
 "d'exploitation », ce n'est pas un problème. Dans ce cas vous parlerez de "
 "distributions du système GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The kernel of a system is like the foundation of a house.  How can a house "
 "be almost complete when it doesn't have a foundation? <span class=\"anchor-"
@@ -1299,7 +1320,7 @@
 "maison peut-elle être presque terminée quand elle n'a pas de fondations ? "
 "<span class=\"anchor-reference-id\">(<a href=\"#house\">#house</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "A kernel is not much like the foundation of a house because building an "
 "operating system is not much like building a house."
@@ -1308,7 +1329,7 @@
 "construire un système d'exploitation n'a pas grand-chose à voir avec la "
 "construction d'une maison."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A house is built from lots of little general parts that are cut and put "
 "together in situ.  They have to be put together from the bottom up.  Thus, "
@@ -1321,7 +1342,7 @@
 "faites, aucune partie substantielle n'a été bâtie ; tout ce que vous avez 
"
 "alors est un trou dans le sol."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "By contrast, an operating system consists of complex components that can be "
 "developed in any order.  When you have developed most of the components, "
@@ -1338,7 +1359,7 @@
 "connectés, mais en attente d'un module vital, ce serait comme le système 
GNU "
 "en 1992."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't the kernel the brain of the system? <span class=\"anchor-reference-id"
 "\">(<a href=\"#brain\">#brain</a>)</span>"
@@ -1346,7 +1367,7 @@
 "Le noyau n'est-il pas le cerveau du système ? <span 
class=\"anchor-reference-"
 "id\">(<a href=\"#brain\">#brain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A computer system is not much like a human body, and no part of it plays a "
 "role comparable to that of the brain in a human."
@@ -1354,7 +1375,7 @@
 "Un ordinateur ne ressemble pas à un corps humain et aucune de ses parties ne 
"
 "joue un rôle comparable à celui du cerveau humain."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't writing the kernel most of the work in an operating system? <span "
 "class=\"anchor-reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</"
@@ -1364,11 +1385,11 @@
 "d'exploitation ? <span class=\"anchor-reference-id\">(<a href=\"#kernelmost"
 "\">#kernelmost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "No, many components take a lot of work."
 msgstr "Non, beaucoup de composants requièrent beaucoup de travail."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "An operating system requires a kernel.  Since the GNU Project didn't develop "
 "a kernel, how can the system be GNU?<span class=\"anchor-reference-id\">(<a "
@@ -1378,7 +1399,7 @@
 "pas développé, comment peut-on parler de « système GNU » ? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#nokernel\">#nokernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The people who argue that way for calling the system &ldquo;Linux&rdquo; are "
 "using a double standard.  An operating system requires compilers, editors, "
@@ -1393,7 +1414,7 @@
 "contenaient les systèmes BSD en 1983. Puisque Torvalds n'en a développé "
 "aucun, comment le système peut-il être « Linux » ?"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "That standard is too strict, not the right way to judge the contributions of "
 "any contributor."
@@ -1401,7 +1422,7 @@
 "Ce standard est trop strict ; ce n'est pas le bon moyen de juger de ce qu'a "
 "apporté chaque contributeur."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds made an important contribution to the operating system we "
 "use; the GNU Project started earlier and contributed much more.  The name "
@@ -1411,7 +1432,7 @@
 "que nous utilisons ; le projet GNU a commencé avant lui et a apporté "
 "beaucoup plus. Le nom « GNU/Linux » reconnaît le mérite de chacun."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How can GNU be an operating system, if I can't get something called &ldquo;"
 "GNU&rdquo; and install it? <span class=\"anchor-reference-id\">(<a href="
@@ -1422,7 +1443,7 @@
 "\"anchor-reference-id\">(<a href=\"#notinstallable\">#notinstallable</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Many <a href=\"/distros/distros.html\"> packaged and installable versions of "
 "GNU</a> are available.  None of them is called simply &ldquo;GNU&rdquo;, but "
@@ -1432,7 +1453,7 @@
 "GNU</a> sont disponibles sous forme de paquets. Aucune d'entre elles ne "
 "s'appelle simplement « GNU », mais dans le fond, c'est ce quelles sont."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We expected to release the GNU system packaged for installation, but this "
 "plan was overtaken by events: in 1992 others were already packaging GNU "
@@ -1454,7 +1475,7 @@
 "d'une version du système contenant le noyau GNU Hurd – qui n'était pas "
 "encore prêt."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Hurd kernel never became sufficiently ready; we only recommend it to "
 "those interested in working on it.  So we never packaged GNU with the GNU "
@@ -1465,7 +1486,7 @@
 "Aussi n'avons-nous jamais empaqueté GNU avec ce noyau. Cependant, Debian a "
 "empaqueté cette combinaison en tant que Debian GNU/Hurd."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are now developing an advanced Scheme-based package manager called Guix "
 "and a complete system distribution based on it called the <a href=\"/"
@@ -1478,7 +1499,7 @@
 "gestionnaire. Cela comporte le réempaquetage d'une partie importante du "
 "système GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We never took the last step of packaging GNU under the name &ldquo;"
 "GNU&rdquo;, but that doesn't alter what kind of thing GNU is.  GNU is an "
@@ -1488,7 +1509,7 @@
 "le nom de « GNU », mais cela n'altère pas sa nature. GNU est un système 
"
 "d'exploitation."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "We're calling the whole system after the kernel, Linux.  Isn't it normal to "
 "name an operating system after a kernel? <span class=\"anchor-reference-id\">"
@@ -1498,7 +1519,7 @@
 "d'appeler un système d'exploitation d'après son noyau ? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "That practice seems to be very rare&mdash;we can't find any examples other "
 "than the misuse of the name &ldquo;Linux&rdquo;.  Normally an operating "
@@ -1514,7 +1535,7 @@
 "général pas de nom particulier ; on l'appelle « noyau de untel » ou du 
"
 "« noyau untel »."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Because those two constructions are used synonymously, the expression &ldquo;"
 "the Linux kernel&rdquo; can easily be misunderstood as meaning &ldquo;the "
@@ -1528,7 +1549,7 @@
 "pouvez éviter ce malentendu en disant ou en écrivant « le noyau, Linux 
» ou "
 "« Linux, le noyau »."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can another system have &ldquo;the feel of Linux&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
@@ -1536,7 +1557,7 @@
 "Est-ce qu'on peut avoir la « sensation de Linux » avec un autre 
système ? "
 "<span class=\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is no such thing as the &ldquo;feel of Linux&rdquo; because Linux has "
 "no user interfaces.  Like any modern kernel, Linux is a base for running "
@@ -1551,7 +1572,7 @@
 "toujours par d'autres programmes, et ce sont eux qui donnent la "
 "« sensation »."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  How about "
 "recommending a shorter name? <span class=\"anchor-reference-id\">(<a href="
@@ -1561,7 +1582,7 @@
 "recommander un nom plus court ? <span class=\"anchor-reference-id\">(<a 
href="
 "\"#long\">#long</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "For a while we tried the name &ldquo;LiGNUx&rdquo;, which combines the words "
 "&ldquo;GNU&rdquo; and &ldquo;Linux&rdquo;.  The reaction was very bad.  "
@@ -1571,7 +1592,7 @@
 "mots « GNU » et « Linux ». La réaction a été très mauvaise. Les 
gens "
 "acceptent beaucoup mieux « GNU/Linux »."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
 "call it &ldquo;GNU/Linux&rdquo; <a href=\"#justgnu\"> for the reasons given "
@@ -1581,7 +1602,7 @@
 "l'appelons « GNU/Linux » <a href=\"#justgnu\"> pour les raisons données 
plus "
 "loin</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How about calling the system &ldquo;GliNUx&rdquo; (instead of &ldquo;GNU/"
 "Linux&rdquo;)? <span class=\"anchor-reference-id\">(<a href="
@@ -1590,7 +1611,7 @@
 "Et si on appelait le système « GliNUx » au lieu de « GNU/Linux » ? 
<span "
 "class=\"anchor-reference-id\">(<a href=\"#long1\">#long1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The name &ldquo;GNU&rdquo; does not visibly appear in &ldquo;Glinux,&rdquo; "
 "so most people would not notice it is there.  Even if it is capitalized as "
@@ -1602,7 +1623,7 @@
 "« GliNUx », la plupart des gens ne se rendraient pas compte pas qu'il y a 
"
 "une référence à GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be comparable to writing &ldquo;GNU/Linux,&rdquo; but putting "
 "&ldquo;GNU/&rdquo; in print so small that most people could not read it."
@@ -1610,7 +1631,7 @@
 "Cela reviendrait à écrire « GNU/Linux » avec « GNU » en caractères 
si petits "
 "que la plupart des gens de pourraient pas le lire."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  Why should "
 "I go to the trouble of saying &ldquo;GNU/&rdquo;? <span class=\"anchor-"
@@ -1620,7 +1641,7 @@
 "peine de dire « GNU » ? <span class=\"anchor-reference-id\">(<a href="
 "\"#long2\">#long2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
 "the system that we developed, can't you take one second to recognize our "
@@ -1630,7 +1651,7 @@
 "le système que nous avons développé, ne pouvez-vous passer une seconde à "
 "reconnaître notre travail ?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Unfortunately, &ldquo;GNU/Linux&rdquo; is five syllables. People won't use "
 "such a long term. Shouldn't you find a shorter one? <span class=\"anchor-"
@@ -1641,7 +1662,7 @@
 "court?<span class=\"anchor-reference-id\">(<a href=\"#long3\">#long3</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, &ldquo;GNU/Linux&rdquo; is only four syllables.  &ldquo;"
 "Unfortunately&rdquo; is five syllables, yet people show no sign of "
@@ -1651,7 +1672,7 @@
 "contient cinq syllabes, pourtant les gens ne rechignent pas à utiliser ce "
 "mot."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Stallman doesn't ask us to call him &ldquo;Richard Matthew Stallman&rdquo; "
 "every the time.  So why ask us to say &ldquo;GNU/Linux&rdquo; every time? "
@@ -1661,7 +1682,7 @@
 "le temps. Alors pourquoi nous demander de dire « GNU/Linux » tout le 
temps ? "
 "<span class=\"anchor-reference-id\">(<a href=\"#long4\">#long4</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Omitting &ldquo;Matthew&rdquo; does not misrepresent anything important "
 "about Stallman's nature, origin, ideas or purpose.  Omitting &ldquo;"
@@ -1672,7 +1693,7 @@
 "omet « GNU », on présente une image déformée de ces aspects du 
système GNU/"
 "Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is an example of a frequent way of hiding a fallacy: to bury it inside "
 "a misleading analogy.  A better analogy would be, &ldquo;Why shouldn't we "
@@ -1682,7 +1703,7 @@
 "on l'enterre dans une analogie trompeuse. Il y aurait une meilleure "
 "analogie : « Pourquoi ne devrions pas appeler Stallman “Torvalds” »?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since Linux is a secondary contribution, would it be false to the facts to "
 "call the system simply &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id"
@@ -1692,7 +1713,7 @@
 "les faits que d'appeler simplement le système « GNU » ? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#justgnu\">#justgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would not be false to the facts, but it is not the best thing to do.  "
 "Here are the reasons we call that system version &ldquo;GNU/Linux&rdquo; "
@@ -1702,7 +1723,7 @@
 "faire. Voici les raisons pour lesquelles nous appelons ce système « GNU/"
 "Linux » plutôt que simplement « GNU » :"
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It's not exactly GNU&mdash;it has a different kernel (that is, Linux).  "
 "Distinguishing GNU/Linux from GNU is useful."
@@ -1710,7 +1731,7 @@
 "Ce n'est pas exactement GNU : il a un noyau différent (c'est-à-dire 
Linux). "
 "Distinguer GNU/Linux de GNU est utile."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It would be ungentlemanly to ask people to <em>stop</em> giving any credit "
 "to Linus Torvalds.  He did write an important component of the system.  We "
@@ -1731,7 +1752,7 @@
 "plutôt qu'en essayant de le priver de reconnaissance pour sa contribution au 
"
 "système."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
 "&ldquo;GNU&rdquo; they may simply not recognize we're talking about the same "
@@ -1743,7 +1764,7 @@
 "reconnaître que nous parlons du même système. Si nous disons « 
GNU/Linux », "
 "ils peuvent faire la relation avec ce dont ils ont entendu parler."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "I would have to pay a fee if I use &ldquo;Linux&rdquo; in the name of a "
 "product, and that would also apply if I say &ldquo;GNU/Linux&rdquo;.  Is it "
@@ -1757,7 +1778,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#trademarkfee\">#trademarkfee</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There's nothing wrong in calling the system &ldquo;GNU&rdquo;; basically, "
 "that's what it is.  It is nice to give Linus Torvalds a share of the credit "
@@ -1768,7 +1789,7 @@
 "crédit, mais vous n'avez aucune obligation de payer pour obtenir le "
 "privilège de le faire."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "So if you want to refer to the system simply as &ldquo;GNU&rdquo;, to avoid "
 "paying the fee for calling it &ldquo;Linux&rdquo;, we won't criticize you."
@@ -1776,7 +1797,7 @@
 "Donc nous n'émettrons aucune objection si vous appelez simplement le 
système "
 "« GNU » pour éviter de payer la taxe associée au nom « Linux »."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today; it includes "
 "TeX, X11, Apache, Perl, and many more programs.  Don't your arguments imply "
@@ -1791,7 +1812,7 @@
 "absurde.) <span class=\"anchor-reference-id\">(<a href=\"#many\">#many</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "What we say is that you ought to give the system's principal developer a "
 "share of the credit.  The principal developer is the GNU Project, and the "
@@ -1801,7 +1822,7 @@
 "d'un système. Ce principal développeur est le projet GNU et, à la base, le 
"
 "système est GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you feel even more strongly about giving credit where it is due, you "
 "might feel that some secondary contributors also deserve credit in the "
@@ -1817,7 +1838,7 @@
 "X11/Linux, faites-le. Si vous pensez que Perl réclame absolument une mention 
"
 "et voulez écrire GNU/Linux/Perl, allez-y."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Since a long name such as GNU/X11/Apache/Linux/TeX/Perl/Python/FreeCiv "
 "becomes absurd, at some point you will have to set a threshold and omit the "
@@ -1831,7 +1852,7 @@
 "d'endroit évident où placer cette limite, donc où que vous la placiez, 
nous "
 "n'émettrons pas de critique."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Different threshold levels would lead to different choices of name for the "
 "system.  But one name that cannot result from concerns of fairness and "
@@ -1845,7 +1866,7 @@
 "équitable de donner toute la reconnaissance à une unique contribution "
 "secondaire (Linux) en omettant la contribution principale (GNU)."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "systemd plays an important role in the GNU/Linux system as it is today; are "
 "we obligated to call it GNU/systemd/Linux? <span class=\"anchor-reference-id"
@@ -1855,7 +1876,7 @@
 "aujourd'hui ; sommes-nous obligés de l'appeler GNU/systemd/Linux ? <span "
 "class=\"anchor-reference-id\">(<a href=\"#others\">#others</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "systemd is a fairly important component, but not as important as the kernel "
 "(Linux), nor as important as the basis of the system as a whole (GNU).  "
@@ -1867,7 +1888,7 @@
 "Cependant, si vous voulez mettre en avant la présence de systemd en appelant 
"
 "le système « GNU/systemd/Linux », il n'y a rien de mal à ça."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today, but they don't "
 "insist on calling it XYZ/Linux.  Why should we treat GNU specially? <span "
@@ -1878,7 +1899,7 @@
 "Pourquoi ce traitement spécial pour GNU ? <span class=\"anchor-reference-id"
 "\">(<a href=\"#others\">#others</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Thousands of projects have developed programs commonly included in today's "
 "GNU/Linux systems.  They all deserve credit for their contributions, but "
@@ -1890,7 +1911,7 @@
 "contribution, mais ce ne sont pas les développeurs principaux du système "
 "pris dans son ensemble, donc ils ne demandent pas à être reconnus comme 
tels."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is different because it is more than just a contributed program, more "
 "than just a collection of contributed programs.  GNU is the framework on "
@@ -1900,7 +1921,7 @@
 "ensemble de programmes apportés en contribution. GNU est le cadre dans "
 "lequel le système a été bâti."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "GNU is a small fraction of the system nowadays, so why should we mention it? "
 "<span class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</"
@@ -1910,7 +1931,7 @@
 "mentionner ? <span class=\"anchor-reference-id\">(<a href=\"#allsmall"
 "\">#allsmall</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In 2008, we found that GNU packages made up 15% of the &ldquo;main&rdquo; "
 "repository of the gNewSense GNU/Linux distribution.  Linux made up 1.5%.  So "
@@ -1922,7 +1943,7 @@
 "gNewSense. Linux représentait 1,5 %. Donc si l'on ne mentionne pas GNU, à "
 "plus forte raison on ne devrait pas l'appeler « Linux »."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is a small fraction of the system nowadays, and Linux is an even smaller "
 "fraction.  But they are the system's core; the system was made by combining "
@@ -1933,7 +1954,7 @@
 "réalisé en les combinant. Par conséquent, le nom « GNU/Linux » reste "
 "approprié."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many companies contributed to the system as it is today; doesn't that mean "
 "we ought to call it GNU/Red&nbsp;Hat/Novell/Linux? <span class=\"anchor-"
@@ -1944,7 +1965,7 @@
 "\"anchor-reference-id\">(<a href=\"#manycompanies\">#manycompanies</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is not comparable to Red Hat or Novell; it is not a company, or an "
 "organization, or even an activity.  GNU is an operating system.  (When we "
@@ -1958,7 +1979,7 @@
 "de développement du système GNU. Le système GNU/Linux est basé sur GNU, 
et "
 "c'est pourquoi GNU doit apparaître dans son nom."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Much of those companies' contribution to the GNU/Linux system lies in the "
 "code they have contributed to various GNU packages including GCC and GNOME.  "
@@ -1970,7 +1991,7 @@
 "ou GNOME. Dire GNU/Linux donne crédit à ces entreprises de la même 
manière "
 "qu'à tous les autres développeurs de GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
@@ -1979,7 +2000,7 @@
 "Pourquoi écrivez-vous « GNU/Linux » au lieu de « GNU Linux » ? 
<span class="
 "\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean "
@@ -1991,7 +2012,7 @@
 "qui est un paquet GNU ». Aucune de ces significations n'est correcte dans 
le "
 "cas présent."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is not a GNU package; that is, it wasn't developed under the GNU "
 "Project's aegis or contributed specifically to the GNU Project.  Linus "
@@ -2003,14 +2024,32 @@
 "Torvalds a écrit Linux de façon indépendante, en tant que projet 
personnel. "
 "Donc le sens « Linux, qui est un paquet GNU » est faux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | We're not talking about a distinct GNU version of Linux, the kernel.  The
+# | free GNU/Linux distros do have a <a
+# | [-href=\"http://directory.fsf.org/project/linux\";>separate-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>separate+} version
+# | of Linux</a>, since the &ldquo;standard&rdquo; version contains
+# | non[---]free firmware &ldquo;blobs&rdquo;.  If this were part of the GNU
+# | Project, it could be considered &ldquo;GNU Linux&rdquo;; but we would not
+# | want to call it that, because it would be too confusing.
+#, fuzzy
+#| msgid ""
+#| "We're not talking about a distinct GNU version of Linux, the kernel.  The "
+#| "free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/";
+#| "project/linux\">separate version of Linux</a>, since the &ldquo;"
+#| "standard&rdquo; version contains non-free firmware &ldquo;blobs&rdquo;.  "
+#| "If this were part of the GNU Project, it could be considered &ldquo;GNU "
+#| "Linux&rdquo;; but we would not want to call it that, because it would be "
+#| "too confusing."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
-"free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/project/";
-"linux\">separate version of Linux</a>, since the &ldquo;standard&rdquo; "
-"version contains non-free firmware &ldquo;blobs&rdquo;.  If this were part "
-"of the GNU Project, it could be considered &ldquo;GNU Linux&rdquo;; but we "
-"would not want to call it that, because it would be too confusing."
+"free GNU/Linux distros do have a <a href=\"https://directory.fsf.org/wiki/";
+"Linux-libre\">separate version of Linux</a>, since the &ldquo;"
+"standard&rdquo; version contains nonfree firmware &ldquo;blobs&rdquo;.  If "
+"this were part of the GNU Project, it could be considered &ldquo;GNU "
+"Linux&rdquo;; but we would not want to call it that, because it would be too "
+"confusing."
 msgstr ""
 "Nous ne parlons pas ici d'une version distincte, GNU, du noyau Linux. Les "
 "distributions libres GNU/Linux ont une <a href=\"http://directory.fsf.org/";
@@ -2020,7 +2059,7 @@
 "mais nous ne voudrions pas l'appeler ainsi car cela prêterait trop à "
 "confusion."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We're talking about a version of GNU, the operating system, distinguished by "
 "having Linux as the kernel.  A slash fits the situation because it means "
@@ -2033,7 +2072,7 @@
 "Sortie »). Ce système est une combinaison de GNU et de Linux, d'où le nom 
"
 "« GNU/Linux »."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are other ways to express &ldquo;combination&rdquo;.  If you think "
 "that a plus-sign is clearer, please use that.  In French, a hyphen is clear: "
@@ -2044,7 +2083,7 @@
 "signe plus est plus clair, utilisez-le. En français, un tiret est clair : "
 "« GNU-Linux ». En espagnol, on dit parfois « GNU con Linux »."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How is the name &ldquo;GNU/Linux&rdquo; pronounced? <span class=\"anchor-"
 "reference-id\">(<a href=\"#pronounce\">#pronounce</a>)</span>"
@@ -2052,7 +2091,7 @@
 "Comment prononce-t-on le nom &ldquo;GNU/Linux&rdquo; ? <span class=\"anchor-"
 "reference-id\">(<a href=\"#pronounce\">#pronounce</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please pronounce it as &ldquo;GNU slash Linux.&rdquo; If you don't pronounce "
 "the slash, people will think you are saying &ldquo;GNU Linux,&rdquo; which "
@@ -2062,7 +2101,7 @@
 "<i>slash</i>, les gens penseront que vous dites « GNU Linux », ce qui 
n'est "
 "<a href=\"#whyslash\">pas un nom adéquat</a> pour cette combinaison."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU Emacs&rdquo; rather than &ldquo;GNU/"
 "Emacs&rdquo;? <span class=\"anchor-reference-id\">(<a href=\"#whynoslash"
@@ -2071,7 +2110,7 @@
 "Pourquoi écrivez-vous « GNU Emacs » plutôt que « GNU/Emacs » ? 
<span class="
 "\"anchor-reference-id\">(<a href=\"#whynoslash\">#whynoslash</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Emacs&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Emacs&rdquo;.  That is the right "
@@ -2081,7 +2120,7 @@
 "« Emacs ». C'est la bonne façon de décrire un programme appelé Emacs 
qui est "
 "un logiciel GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;GNU/Emacs&rdquo; would mean the combination of GNU, the operating "
 "system, and the program Emacs.  That doesn't fit this program, so &ldquo;GNU/"
@@ -2092,7 +2131,7 @@
 "programme, c'est pourquoi « GNU/Emacs » est une mauvaise façon de le "
 "désigner."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why &ldquo;GNU/Linux&rdquo; rather than &ldquo;Linux/GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
@@ -2100,7 +2139,7 @@
 "Pourquoi « GNU/Linux » plutôt que « Linux/GNU » ? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is right and proper to mention the principal contribution first.  The GNU "
 "contribution to the system is not only bigger than Linux and prior to Linux, "
@@ -2111,7 +2150,7 @@
 "importante et plus ancienne que Linux, mais c'est nous qui avons initié "
 "l'ensemble du travail."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the lowest "
 "level of the system and GNU fills technically higher levels."
@@ -2120,7 +2159,7 @@
 "niveau du système alors que GNU correspond à des niveaux techniquement plus 
"
 "élevés."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
 "lot better than what people usually do, which is to omit GNU entirely and "
@@ -2130,7 +2169,7 @@
 "largement plus correct que ce que font les gens d'habitude, à savoir omettre 
"
 "complètement GNU et donner l'impression que le système entier est Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
 "say anything about what the system consists of.  Why shouldn't they call it "
@@ -2142,7 +2181,7 @@
 "l'appeler comme ils le veulent ? <span class=\"anchor-reference-id\">(<a "
 "href=\"#distronames0\">#distronames0</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling a system &ldquo;Foobar Linux&rdquo; implies that it's a flavor of "
 "&ldquo;Linux,&rdquo; and people <a href=\"#distronames\">understand it that "
@@ -2151,7 +2190,7 @@
 "Appeler un système « Toto Linux » implique que c'est une variante de "
 "« Linux » et <a href=\"#distronames\"> c'est ce que les gens 
comprennent</a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If they called a GNU/Linux distro &ldquo;Foobar BSD,&rdquo; you would call "
 "that a mistake.  &ldquo;This system is not BSD,&rdquo; you would tell them.  "
@@ -2161,7 +2200,7 @@
 "probablement que c'est une erreur. Vous leur diriez : « Ce système n'est 
pas "
 "BSD ». Eh bien, ce n'est pas Linux non plus."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro is called &ldquo;Foobar Linux&rdquo;; doesn't that show it's "
 "really Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
@@ -2171,7 +2210,7 @@
 "bien Linux ? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
 "\">#distronames</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It means that the people who make the &ldquo;Foobar Linux&rdquo; distro are "
 "repeating the common mistake. We appreciate that distributions like Debian, "
@@ -2185,7 +2224,7 @@
 "partie de leur nom officiel, et espérons que si vous êtes impliqué dans 
une "
 "autre distribution, vous l'encouragerez à faire de même."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's official name is &ldquo;Foobar Linux&rdquo;; isn't it wrong to "
 "call the distro anything but &ldquo;Foobar Linux&rdquo;? <span class="
@@ -2195,7 +2234,7 @@
 "pas un problème de l'appeler autrement que « Toto Linux » ? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#distronames1\">#distronames1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When they spread misinformation by changing &ldquo;GNU&rdquo; to &ldquo;"
 "Linux&rdquo;, and call their version of it &ldquo;Foobar Linux&rdquo;, it's "
@@ -2206,7 +2245,7 @@
 "appellent leur version du système « Toto Linux », il convient de 
rétablir la "
 "vérité en l'appelant « Toto GNU/Linux »."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be more effective to ask companies such as Mandrake, Red Hat and "
 "IBM to call their distributions &ldquo;GNU/Linux&rdquo; rather than asking "
@@ -2218,7 +2257,7 @@
 "demander à chaque personne individuellement ? <span 
class=\"anchor-reference-"
 "id\">(<a href=\"#companies\">#companies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It isn't a choice of one or the other&mdash;we ask companies and "
 "organizations and individuals to help spread the word about this.  In fact, "
@@ -2237,7 +2276,7 @@
 "d'autres termes, cette entreprise ne se préoccupe pas de ce qui est juste ou 
"
 "non."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We can't make them do this right, but we're not the sort to give up just "
 "because the road isn't easy.  You may not have as much influence at your "
@@ -2251,7 +2290,7 @@
 "de même aider. Ensemble nous pouvons changer la situation à tel point que "
 "les entreprises feront plus de profit en l'appelant « GNU/Linux »."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to reserve the name &ldquo;GNU/Linux&rdquo; for "
 "distributions that are purely free software? After all, that is the ideal of "
@@ -2263,15 +2302,35 @@
 "bien l'idéal de GNU. <span class=\"anchor-reference-id\">(<a href=\"#reserve"
 "\">#reserve</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+# | The widespread practice of adding non[---]free software to the GNU/Linux
+# | system is a major problem for our community.  It teaches the users that
+# | non[---]free software is ok, and that using it is part of the spirit of
+# | &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of
+# | their mission to help users use non[---]free add-ons, and may even invite
+# | salesmen to come and make sales pitches for them.  They adopt goals such
+# | as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them
+# | use non[---]free applications and drivers), or making the system more
+# | popular even at the cost of freedom.
+#, fuzzy
+#| msgid ""
+#| "The widespread practice of adding non-free software to the GNU/Linux "
+#| "system is a major problem for our community.  It teaches the users that "
+#| "non-free software is ok, and that using it is part of the spirit of "
+#| "&ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part "
+#| "of their mission to help users use non-free add-ons, and may even invite "
+#| "salesmen to come and make sales pitches for them.  They adopt goals such "
+#| "as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them "
+#| "use non-free applications and drivers), or making the system more popular "
+#| "even at the cost of freedom."
 msgid ""
-"The widespread practice of adding non-free software to the GNU/Linux system "
-"is a major problem for our community.  It teaches the users that non-free "
+"The widespread practice of adding nonfree software to the GNU/Linux system "
+"is a major problem for our community.  It teaches the users that nonfree "
 "software is ok, and that using it is part of the spirit of &ldquo;"
 "Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of their "
-"mission to help users use non-free add-ons, and may even invite salesmen to "
+"mission to help users use nonfree add-ons, and may even invite salesmen to "
 "come and make sales pitches for them.  They adopt goals such as &ldquo;"
-"helping the users&rdquo; of GNU/Linux (including helping them use non-free "
+"helping the users&rdquo; of GNU/Linux (including helping them use nonfree "
 "applications and drivers), or making the system more popular even at the "
 "cost of freedom."
 msgstr ""
@@ -2286,11 +2345,11 @@
 "l'utilisation d'applications et de pilotes non libres), ou encore rendre le "
 "système plus populaire, même au prix de la liberté."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The question is how to try to change this."
 msgstr "Comment faire changer cela, voilà la question."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Given that most of the community which uses GNU with Linux already does not "
 "realize that's what it is, for us to disown these adulterated versions, "
@@ -2305,13 +2364,29 @@
 "le message. Ils répondraient simplement qu'ils n'avaient jamais pensé que "
 "ces systèmes étaient d'abord GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The way to lead these users to see a connection with freedom is exactly
+# | the opposite: to inform them that all these system versions <em>are</em>
+# | versions of GNU, that they all are based on a system that exists
+# | specifically for the sake of the users' freedom.  With this understanding,
+# | they can start to recognize the distributions that include non[---]free
+# | software as perverted, adulterated versions of GNU, instead of thinking
+# | they are proper and appropriate &ldquo;versions of Linux&rdquo;.
+#, fuzzy
+#| msgid ""
+#| "The way to lead these users to see a connection with freedom is exactly "
+#| "the opposite: to inform them that all these system versions <em>are</em> "
+#| "versions of GNU, that they all are based on a system that exists "
+#| "specifically for the sake of the users' freedom.  With this "
+#| "understanding, they can start to recognize the distributions that include "
+#| "non-free software as perverted, adulterated versions of GNU, instead of "
+#| "thinking they are proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgid ""
 "The way to lead these users to see a connection with freedom is exactly the "
 "opposite: to inform them that all these system versions <em>are</em> "
 "versions of GNU, that they all are based on a system that exists "
 "specifically for the sake of the users' freedom.  With this understanding, "
-"they can start to recognize the distributions that include non-free software "
+"they can start to recognize the distributions that include nonfree software "
 "as perverted, adulterated versions of GNU, instead of thinking they are "
 "proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgstr ""
@@ -2324,7 +2399,7 @@
 "de GNU, au lieu de penser que ce sont des « versions de Linux » correctes 
et "
 "légitimes."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is very useful to start GNU/Linux User Groups, which call the system GNU/"
 "Linux and adopt the ideals of the GNU Project as a basis for their "
@@ -2343,7 +2418,7 @@
 "buts plus superficiels ont le droit d'avoir leur point de vue, mais ne les "
 "laissez pas vous entraîner !"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not make a GNU distribution of Linux (sic) and call that GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
@@ -2353,7 +2428,7 @@
 "Linux ? <span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "All the &ldquo;Linux&rdquo; distributions are actually versions of the GNU "
 "system with Linux as the kernel.  The purpose of the term &ldquo;GNU/"
@@ -2367,7 +2442,7 @@
 "appeler uniquement celle-là GNU/Linux rendrait incompréhensible ce que nous 
"
 "voulons expliquer."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "As for developing a distribution of GNU/Linux, we already did this once, "
 "when we funded the early development of Debian GNU/Linux.  To do it again "
@@ -2381,7 +2456,7 @@
 "beaucoup de travail, et à moins que la nouvelle distribution n'ait des "
 "avantages substantiels par rapport aux autres, elle ne servirait à rien."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Instead we help the developers of 100% free GNU/Linux distributions, such as "
 "gNewSense and Ututo."
@@ -2389,7 +2464,7 @@
 "À la place, nous aidons les développeurs de distributions GNU/Linux 100 % "
 "libres, comme gNewSense et Ututo."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not just say &ldquo;Linux is the GNU kernel&rdquo; and release some "
 "existing version of GNU/Linux under the name &ldquo;GNU&rdquo;? <span class="
@@ -2399,7 +2474,7 @@
 "une version existante quelconque de GNU/Linux sous le nom « GNU » ? 
<span "
 "class=\"anchor-reference-id\">(<a href=\"#linuxgnu\">#linuxgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It might have been a good idea to adopt Linux as the GNU kernel back in "
 "1992.  If we had realized, then, how long it would take to get the GNU Hurd "
@@ -2410,7 +2485,7 @@
 "Hurd, nous aurions pu le faire (hélas, ce n'est facile à dire qu'avec du "
 "recul)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we were to take an existing version of GNU/Linux and relabel it as &ldquo;"
 "GNU&rdquo;, that would be somewhat like making a version of the GNU system "
@@ -2422,7 +2497,7 @@
 "système GNU et la réétiqueter « Linux ». Ce n'était pas juste et nous 
ne "
 "voulons pas faire la même chose."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Did the GNU Project condemn and oppose use of Linux in the early days? <span "
 "class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
@@ -2431,7 +2506,7 @@
 "dans les premiers temps ? <span class=\"anchor-reference-id\">(<a href="
 "\"#condemn\">#condemn</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We did not adopt Linux as our kernel, but we didn't condemn or oppose it.  "
 "In 1993 we started discussing the arrangements to sponsor the development of "
@@ -2451,7 +2526,7 @@
 "Mais ces changements étaient souvent ad hoc et non portables ; il était "
 "nécessaire de les nettoyer pour l'installation."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who had made the changes showed little interest in cooperating "
 "with us.  One of them actually told us that he didn't care about working "
@@ -2470,7 +2545,7 @@
 "personnes développant un système basé principalement sur le système GNU "
 "refusait de travailler avec nous, et c'est toujours pratiquement le seul."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It was this experience that first showed us that people were calling a "
 "version of the GNU system &ldquo;Linux&rdquo;, and that this confusion was "
@@ -2484,7 +2559,7 @@
 "Linux est notre réponse à ce problème et aux autres problèmes posés par "
 "cette erreur de dénomination."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why did you wait so long before asking people to use the name GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
@@ -2493,7 +2568,7 @@
 "nom GNU/Linux ? <span class=\"anchor-reference-id\">(<a href=\"#wait"
 "\">#wait</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually we didn't.  We began talking privately with developers and "
 "distributors about this in 1994, and made a more public campaign in 1996.  "
@@ -2504,7 +2579,7 @@
 "campagne plus publique en 1996. Nous continuerons aussi longtemps que ce "
 "sera nécessaire."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should the GNU/<i>name</i> convention be applied to all programs that are "
 "GPL'ed? <span class=\"anchor-reference-id\">(<a href=\"#allgpled"
@@ -2514,7 +2589,7 @@
 "GPL ? <span class=\"anchor-reference-id\">(<a href=\"#allgpled\">#allgpled</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We never refer to individual programs as &ldquo;GNU/<i>name</i>&rdquo;.  "
 "When a program is a GNU package, we may call it &ldquo;GNU <i>name</"
@@ -2524,7 +2599,7 @@
 "« GNU/[nom] ». Quand un programme est un paquet GNU, nous l'appelons "
 "généralement « GNU [nom] »."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU, the operating system, is made up of many different programs.  Some of "
 "the programs in GNU were written as part of the GNU Project or specifically "
@@ -2536,7 +2611,7 @@
 "parties du projet GNU ou comme contribution spéciale au projet : ce sont 
les "
 "paquets GNU, et nous utilisons souvent « GNU » dans leurs noms."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It's up to the developers of a program to decide if they want to contribute "
 "it and make it a GNU package.  If you have developed a program and you would "
@@ -2550,7 +2625,7 @@
 "gnu@gnu.org&gt;</a>, pour que nous puissions l'évaluer pour décider si nous 
"
 "voulons le prendre."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It wouldn't be fair to put the name GNU on every individual program that is "
 "released under the GPL.  If you write a program and release it under the "
@@ -2570,7 +2645,7 @@
 "peut pas demander de reconnaissance pour cela, et il serait incorrect de "
 "mettre « GNU » dans son nom."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In contrast, we do deserve the overall credit for the GNU operating system "
 "as a whole, even though not for each and every program in it.  The system "
@@ -2584,7 +2659,7 @@
 "1984, donc de nombreuses années avant que le développement de Linux ait "
 "commencé."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The operating system in which Linux became popular was basically the same as "
 "the GNU operating system.  It was not entirely the same, because it had a "
@@ -2596,7 +2671,7 @@
 "même, parce qu'il avait un noyau différent, mais c'était majoritairement 
le "
 "même système. C'était une variante de GNU. C'était le système GNU/Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux continues to be used primarily in derivatives of that system&mdash;in "
 "today's versions of the GNU/Linux system.  What gives these systems their "
@@ -2608,7 +2683,7 @@
 "constituent le centre et donnent à ces systèmes leur identité, pas 
seulement "
 "Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since much of GNU comes from Unix, shouldn't GNU give credit to Unix by "
 "using &ldquo;Unix&rdquo; in its name? <span class=\"anchor-reference-id\">"
@@ -2618,7 +2693,7 @@
 "crédit à Unix en utilisant « Unix » dans son nom ? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#unix\">#unix</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Actually, none of GNU comes from Unix.  Unix was proprietary software (and "
 "still is), so using any of its code in GNU would have been illegal.  This is "
@@ -2635,7 +2710,7 @@
 "besoin d'un système libre pour les remplacer. Nous ne pouvions copier aucun "
 "programme d'Unix, ni même une portion de programme : tout a dû être 
réécrit."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "No code in GNU comes from Unix, but GNU is a Unix-compatible system; "
 "therefore, many of the ideas and specifications of GNU do come from Unix.  "
@@ -2650,13 +2725,29 @@
 "selon la tradition d'acronymes récursifs qui a débuté chez les hackers 
dans "
 "les années 70."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.
+# |  The author of TINT wrote another implementation of TECO (there were
+# | already many of them, for various systems), but instead of calling it by a
+# | dull name like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of
+# | a clever amusing name.  (That's what hacking means: <a
+# | href=\"http{+s+}://stallman.org/articles/on-hacking.html\">playful
+# | cleverness</a>.)
+#, fuzzy
+#| msgid ""
+#| "The first such recursive acronym was TINT, &ldquo;TINT Is Not "
+#| "TECO&rdquo;.  The author of TINT wrote another implementation of TECO "
+#| "(there were already many of them, for various systems), but instead of "
+#| "calling it by a dull name like &ldquo;<em>somethingorother</em> "
+#| "TECO&rdquo;, he thought of a clever amusing name.  (That's what hacking "
+#| "means: <a href=\"http://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
 "The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
 "The author of TINT wrote another implementation of TECO (there were already "
 "many of them, for various systems), but instead of calling it by a dull name "
 "like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of a clever "
-"amusing name.  (That's what hacking means: <a href=\"http://stallman.org/";
+"amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
 "Le premier de ces acronymes était TINT, <i>TINT Is Not <abbr title=\"Text "
@@ -2667,7 +2758,7 @@
 "amusant (c'est ce que hacking signifie : <a href=\"http://stallman.org/";
 "articles/on-hacking.html\">intelligence ludique</a>)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Other hackers enjoyed that name so much that we imitated the approach.  It "
 "became a tradition that, when you were writing from scratch a program that "
@@ -2683,7 +2774,7 @@
 "Not Klever</em>. Dans le même esprit nous avons appelé <em>GNU's Not Unix</"
 "em> notre substitut à Unix."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Historically, AT&amp;T which developed Unix did not want anyone to give it "
 "credit by using &ldquo;Unix&rdquo; in the name of a similar system, not even "
@@ -2700,7 +2791,7 @@
 "tout aussi privatrice qu'Unix) a reçu un nom complètement différent qui "
 "n'incluait pas « Unix »."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we say &ldquo;GNU/BSD&rdquo; too? <span class=\"anchor-reference-id\">"
 "(<a href=\"#bsd\">#bsd</a>)</span>"
@@ -2708,7 +2799,7 @@
 "Faut-il dire également « GNU/BSD » ? <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems, "
 "because that term does not fit the history of the BSD systems."
@@ -2716,9 +2807,19 @@
 "Nous n'appelons pas les systèmes BSD (FreeBSD, etc.)  « systèmes GNU/BSD 
», "
 "parce que ce terme ne convient pas, étant donnée l'histoire des systèmes 
BSD."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The BSD system was developed by UC Berkeley as non[---]free software in
+# | the 80s, and became free in the early 90s.  A free operating system that
+# | exists today is almost certainly either a variant of the GNU system, or a
+# | kind of BSD system.
+#, fuzzy
+#| msgid ""
+#| "The BSD system was developed by UC Berkeley as non-free software in the "
+#| "80s, and became free in the early 90s.  A free operating system that "
+#| "exists today is almost certainly either a variant of the GNU system, or a "
+#| "kind of BSD system."
 msgid ""
-"The BSD system was developed by UC Berkeley as non-free software in the 80s, "
+"The BSD system was developed by UC Berkeley as nonfree software in the 80s, "
 "and became free in the early 90s.  A free operating system that exists today "
 "is almost certainly either a variant of the GNU system, or a kind of BSD "
 "system."
@@ -2729,7 +2830,7 @@
 "presque certainement une variante, soit du système GNU, soit d'un système "
 "BSD."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "People sometimes ask whether BSD too is a variant of GNU, as GNU/Linux is.  "
 "It is not.  The BSD developers were inspired to make their code free "
@@ -2744,7 +2845,7 @@
 "convaincus de le faire, mais le code n'a que peu de recoupement avec celui "
 "de GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "BSD systems today use some GNU packages, just as the GNU system and its "
 "variants use some BSD programs; however, taken as wholes, they are two "
@@ -2759,7 +2860,7 @@
 "au système GNU, donc un nom comme GNU/BSD ne convient pas du tout à la "
 "situation."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The connection between GNU/Linux and GNU is much closer, and that's why the "
 "name &ldquo;GNU/Linux&rdquo; is appropriate for it."
@@ -2767,7 +2868,7 @@
 "La relation entre GNU/Linux et GNU est beaucoup plus étroite ; c'est la "
 "raison pour laquelle le nom « GNU/Linux » est approprié."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is a version of GNU which uses the kernel from NetBSD.  Its developers "
 "call it &ldquo;Debian GNU/NetBSD&rdquo;, but &ldquo;GNU/"
@@ -2781,7 +2882,7 @@
 "seulement le noyau. Ce n'est pas un système BSD, puisque la majorité du "
 "système est identique au système GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "If I install the GNU tools on Windows, does that mean I am running a GNU/"
 "Windows system? <span class=\"anchor-reference-id\">(<a href=\"#othersys"
@@ -2791,7 +2892,7 @@
 "fonctionne sous un système GNU/Windows ? <span 
class=\"anchor-reference-id\">"
 "(<a href=\"#othersys\">#othersys</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
 "GNU are just a part of the GNU software, which is just a part of the GNU "
@@ -2805,7 +2906,7 @@
 "d'exploitation complet, mais il n'aurait aucun code en commun avec GNU. "
 "C'est donc une situation très différente de GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can't Linux be used without GNU? <span class=\"anchor-reference-id\">(<a "
 "href=\"#justlinux\">#justlinux</a>)</span>"
@@ -2813,7 +2914,7 @@
 "Linux ne peut-il être utilisé sans GNU ? <span 
class=\"anchor-reference-id\">"
 "(<a href=\"#justlinux\">#justlinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is used by itself, or with small other programs, in some appliances.  "
 "These small software systems are a far cry from the GNU/Linux system.  Users "
@@ -2828,7 +2929,7 @@
 "ces appareils n'exécutent que Linux, pour montrer combien ces petites "
 "plateformes sont différentes de GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How much of the GNU system is needed for the system to be GNU/Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
@@ -2837,7 +2938,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "&ldquo;How much&rdquo; is not a meaningful question because the GNU system "
 "does not have precise boundaries."
@@ -2845,7 +2946,7 @@
 "« Quelle quantité » n'est pas une question sensée parce que le système 
GNU "
 "n'a pas de limite précise."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is an operating system maintained by a community.  It includes far more "
 "than just the GNU software packages (of which we have a specific list), and "
@@ -2862,7 +2963,7 @@
 "partie, il n'y a aucun moyen probant de dire « quelle quantité » on en a 
"
 "utilisé."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we look at the level of packages, Linux is one important package in the "
 "GNU/Linux system.  The inclusion of one important GNU package is enough to "
@@ -2872,7 +2973,7 @@
 "système GNU/Linux. L'inclusion d'un paquet GNU important suffit à justifier 
"
 "notre demande de mention équivalente."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Are there complete Linux systems [sic] without GNU? <span class=\"anchor-"
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
@@ -2882,7 +2983,7 @@
 "\"anchor-reference-id\">(<a href=\"#linuxsyswithoutgnu"
 "\">#linuxsyswithoutgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There are complete systems that contain Linux and not GNU; Android is an "
 "example.  But it is a mistake to call them &ldquo;Linux&rdquo; systems, just "
@@ -2892,7 +2993,7 @@
 "est un exemple. Mais c'est une erreur d'appeler ces systèmes « Linux », 
tout "
 "comme d'appeler GNU « système Linux »."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android is very different from the GNU/Linux system&mdash;because the two "
 "have very little code in common.  In fact, the only thing they have in "
@@ -2902,7 +3003,7 @@
 "ont très peu de code en commun. En fait, la seule chose qu'ils ont en commun 
"
 "est Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
 "necessary to say things like, &ldquo;Android contains Linux, but it isn't "
@@ -2914,7 +3015,7 @@
 "n'est pas Linux, parce qu'il n'a pas les bibliothèques et outils Linux [sic] 
"
 "habituels [c'est-à-dire le système GNU]."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android contains just as much of Linux as GNU/Linux does.  What it doesn't "
 "have is the GNU system.  Android replaces that with Google software that "
@@ -2926,7 +3027,7 @@
 "fonctionnent très différemment. Ce qui rend Android différent de GNU/Linux 
"
 "est l'absence de GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Is it correct to say &ldquo;using Linux&rdquo; if it refers to using GNU/"
 "Linux and using Android? <span class=\"anchor-reference-id\">(<a href="
@@ -2938,7 +3039,7 @@
 "\"#usegnulinuxandandroidlinuxsyswithoutgnu"
 "\">#usegnulinuxandandroidlinuxsyswithoutgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Far from it.  That usage is so strained that people will not understand the "
 "intended meaning."
@@ -2946,7 +3047,7 @@
 "Loin de là. Cet usage est si limite que les gens ne comprendront pas ce que "
 "vous voulez dire."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public will find it very strange to speak of using Android as &ldquo;"
 "using Linux&rdquo;.  It's like having a conversation, then saying you were "
@@ -2957,7 +3058,7 @@
 "dire ensuite qu'on a discuté avec les intestins ou le système circulatoire "
 "de la personne."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public <em>will</em> understand the idea of &ldquo;using Linux&rdquo; "
 "when it's really GNU/Linux, by way of the usual misunderstanding: thinking "
@@ -2967,7 +3068,7 @@
 "derrière « utiliser Linux » du fait de la méprise habituelle qui 
consiste à "
 "assimiler le système complet à « Linux »."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Use of Android and use of GNU/Linux are totally different, as different as "
 "driving a car and riding a bicycle.  The fact that the first two both "
@@ -2990,7 +3091,7 @@
 "sans ambiguïté de l'utilisation de GNU/Linux ou d'Android, il faut dire "
 "« utiliser GNU/Linux ou Android »."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not call the system &ldquo;Linux&rdquo; anyway, and strengthen Linus "
 "Torvalds' role as posterboy for our community? <span class=\"anchor-"
@@ -3001,7 +3102,7 @@
 "communauté ? <span class=\"anchor-reference-id\">(<a href=\"#helplinus"
 "\">#helplinus</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Linus Torvalds is the &ldquo;posterboy&rdquo; (other people's choice of "
 "word, not ours) for his goals, not ours.  His goal is to make the system "
@@ -3020,12 +3121,30 @@
 "principe éthique, c'est pourquoi le public n'associe pas le nom « Linux 
» "
 "avec ce principe."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | Linus publicly states his disagreement with the free software movement's
+# | ideals.  He developed non[---]free software in his job for many years (and
+# | said so to a large audience at a &ldquo;Linux&rdquo;World show), and
+# | publicly invited fellow developers of Linux, the kernel, to use
+# | non[---]free software to work on it with him.  He goes even further, and
+# | rebukes people who suggest that engineers and scientists should consider
+# | social consequences of our technical work&mdash;rejecting the lessons
+# | society learned from the development of the atom bomb.
+#, fuzzy
+#| msgid ""
+#| "Linus publicly states his disagreement with the free software movement's "
+#| "ideals.  He developed non-free software in his job for many years (and "
+#| "said so to a large audience at a &ldquo;Linux&rdquo;World show), and "
+#| "publicly invited fellow developers of Linux, the kernel, to use non-free "
+#| "software to work on it with him.  He goes even further, and rebukes "
+#| "people who suggest that engineers and scientists should consider social "
+#| "consequences of our technical work&mdash;rejecting the lessons society "
+#| "learned from the development of the atom bomb."
 msgid ""
 "Linus publicly states his disagreement with the free software movement's "
-"ideals.  He developed non-free software in his job for many years (and said "
+"ideals.  He developed nonfree software in his job for many years (and said "
 "so to a large audience at a &ldquo;Linux&rdquo;World show), and publicly "
-"invited fellow developers of Linux, the kernel, to use non-free software to "
+"invited fellow developers of Linux, the kernel, to use nonfree software to "
 "work on it with him.  He goes even further, and rebukes people who suggest "
 "that engineers and scientists should consider social consequences of our "
 "technical work&mdash;rejecting the lessons society learned from the "
@@ -3041,7 +3160,7 @@
 "conséquences sociétales de leurs travaux techniques, rejetant ainsi les "
 "leçons qu'a tirées la société du développement de la bombe atomique."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with writing a free program for the motivations of "
 "learning and having fun; the kernel Linus wrote for those reasons was an "
@@ -3061,7 +3180,7 @@
 "doivent prendre conscience que le système d'exploitation dont il s'agit "
 "prend racine dans un idéal de liberté, pas dans ses idées."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong for us to label Linus Torvalds' work as GNU? <span class="
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
@@ -3070,7 +3189,7 @@
 "Torvalds l'étiquette « GNU » ? <span class=\"anchor-reference-id\">(<a 
href="
 "\"#claimlinux\">#claimlinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong, so we don't do that.  Torvalds' work is Linux, the "
 "kernel; we are careful not to attribute that work to the GNU Project or "
@@ -3082,7 +3201,7 @@
 "travail au projet GNU ni lui mettre l'étiquette « GNU ». Quand nous 
parlons "
 "du système entier, le nom « GNU/Linux » lui donne une part du crédit."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Does Linus Torvalds agree that Linux is just the kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
@@ -3090,10 +3209,23 @@
 "Linus Torvalds reconnaît-il que Linux est uniquement le noyau ? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | He recognized this at the beginning.  The earliest Linux release notes
+# | said, <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | &ldquo;Most of the tools used with linux are GNU software and are under
+# | the GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
+# |  for more info&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
+#| "versions/RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are "
+#| "GNU software and are under the GNU copyleft. These tools aren't in the "
+#| "distribution - ask me (or GNU)  for more info&rdquo;</a>."
 msgid ""
 "He recognized this at the beginning.  The earliest Linux release notes said, "
-"<a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"<a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
 "RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are GNU software "
 "and are under the GNU copyleft. These tools aren't in the distribution - ask "
 "me (or GNU)  for more info&rdquo;</a>."
@@ -3105,7 +3237,7 @@
 "distribution ; adressez-vous à moi (ou à GNU) pour toute information "
 "supplémentaire</a>. »"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not finish the GNU Hurd kernel, release the GNU system as a whole, and "
 "forget the question of what to call GNU/Linux? <span class=\"anchor-"
@@ -3115,7 +3247,7 @@
 "tout et arrêter de se demander comment appeler GNU/Linux ? <span class="
 "\"anchor-reference-id\">(<a href=\"#finishhurd\">#finishhurd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We would like credit for the GNU operating system no matter which kernel is "
 "used with it."
@@ -3123,13 +3255,27 @@
 "Nous voudrions qu'on nous crédite du système d'exploitation GNU, quel que "
 "soit le noyau utilisé avec lui."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | Making the GNU Hurd work well enough to compete with Linux would be a big
+# | job, and it's not clearly necessary.  The only thing ethically wrong with
+# | Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the
+# | best fix for that problem is <a
+# | [-href=\"http://fsf.org/campaigns/priority-projects\";>-]
+# | {+href=\"https://www.fsf.org/campaigns/priority-projects\";>+} developing
+# | free replacement for the blobs</a>.
+#, fuzzy
+#| msgid ""
+#| "Making the GNU Hurd work well enough to compete with Linux would be a big "
+#| "job, and it's not clearly necessary.  The only thing ethically wrong with "
+#| "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the "
+#| "best fix for that problem is <a href=\"http://fsf.org/campaigns/priority-";
+#| "projects\"> developing free replacement for the blobs</a>."
 msgid ""
 "Making the GNU Hurd work well enough to compete with Linux would be a big "
 "job, and it's not clearly necessary.  The only thing ethically wrong with "
 "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the best "
-"fix for that problem is <a href=\"http://fsf.org/campaigns/priority-projects";
-"\"> developing free replacement for the blobs</a>."
+"fix for that problem is <a href=\"https://www.fsf.org/campaigns/priority-";
+"projects\"> developing free replacement for the blobs</a>."
 msgstr ""
 "Rendre le GNU Hurd assez opérationnel pour faire concurrence à Linux serait 
"
 "un gros travail dont la nécessité n'est pas évidente. Le seul défaut 
éthique "
@@ -3137,7 +3283,7 @@
 "le meilleur remède à ce problème est de <a 
href=\"http://fsf.org/campaigns/";
 "priority-projects\">développer des micrologiciels libres de 
substitution</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The battle is already lost&mdash;society has made its decision and we can't "
 "change it, so why even think about it? <span class=\"anchor-reference-id\">"
@@ -3147,7 +3293,7 @@
 "pouvons rien y changer, pourquoi continuer à y penser ? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#lost\">#lost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This isn't a battle, it is a campaign of education.  What to call the system "
 "is not a single decision, to be made at one moment by &ldquo;society&rdquo;: "
@@ -3163,7 +3309,7 @@
 "pouvez décider d'appeler le système « GNU/Linux » vous-même, et ainsi 
vous "
 "contribuerez à éduquer les autres."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Society has made its decision and we can't change it, so what good does it "
 "do if I say &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id\">(<a "
@@ -3173,7 +3319,7 @@
 "cela fait-il si je dis « GNU/Linux » ? <span 
class=\"anchor-reference-id\">"
 "(<a href=\"#whatgood\">#whatgood</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is not an all-or-nothing situation: correct and incorrect pictures are "
 "being spread more or less by various people.  If you call the system &ldquo;"
@@ -3194,7 +3340,7 @@
 "éduqué un nombre de gens considérable avec très peu de travail. Et 
certains "
 "d'entre eux propageront sûrement la rectification à d'autres."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to call the system &ldquo;Linux&rdquo; and teach "
 "people its real origin with a ten-minute explanation? <span class=\"anchor-"
@@ -3204,7 +3350,7 @@
 "gens son origine réelle avec une explication tenant en 10 minutes ? <span "
 "class=\"anchor-reference-id\">(<a href=\"#explain\">#explain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "If you help us by explaining to others in that way, we appreciate your "
 "effort, but that is not the best method.  It is not as effective as calling "
@@ -3215,7 +3361,7 @@
 "pas aussi efficace que d'appeler le système « GNU/Linux », et cela fait "
 "mauvais usage de votre temps."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is ineffective because it may not sink in, and surely will not "
 "propagate.  Some of the people who hear your explanation will pay attention, "
@@ -3232,7 +3378,7 @@
 "probable qu'elles l'appelleront simplement « Linux ». Sans penser à mal, 
"
 "elles aideront à propager l'image incorrecte."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is inefficient because it takes a lot more time.  Saying and writing "
 "&ldquo;GNU/Linux&rdquo; will take you only a few seconds a day, not minutes, "
@@ -3247,7 +3393,7 @@
 "écrivez et parlez est de loin la manière la plus facile d'aider 
efficacement "
 "le projet GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people laugh at you when you ask them to call the system GNU/Linux.  "
 "Why do you subject yourself to this treatment? <span class=\"anchor-"
@@ -3257,7 +3403,7 @@
 "système GNU/Linux. Pourquoi s'exposer à ce traitement ? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#treatment\">#treatment</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; tends to give people a mistaken "
 "picture of the system's history and reason for existence.  People who laugh "
@@ -3272,7 +3418,7 @@
 "rigolent quand nous demandons d'être reconnus pour notre travail. Si elles "
 "connaissaient la vérité, elles ne riraient probablement pas."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Why do we take the risk of making a request that sometimes leads people to "
 "ridicule us? Because often it has useful results that help the GNU Project.  "
@@ -3283,7 +3429,7 @@
 "qui aident le projet GNU. Nous prenons le risque de moqueries infondées pour 
"
 "réaliser notre objectif."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you see such an ironically unfair situation occurring, please don't sit "
 "idly by.  Please teach the laughing people the real history.  When they see "
@@ -3294,7 +3440,7 @@
 "l'histoire réelle. Quand ils se rendront compte que la demande est fondée, "
 "ceux qui ont une once de bon sens arrêteront de rire."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people condemn you when you ask them to call the system GNU/Linux.  "
 "Don't you lose by alienating them? <span class=\"anchor-reference-id\">(<a "
@@ -3305,7 +3451,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#alienate\">#alienate</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not much.  People who don't appreciate our role in developing the system are "
 "unlikely to make substantial efforts to help us.  If they do work that "
@@ -3322,7 +3468,7 @@
 "apprennent aux autres à attribuer notre travail à une autre personne, ce 
qui "
 "mine notre capacité à recruter de l'aide extérieure."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It makes no sense to worry about alienating people who are already mostly "
 "uncooperative, and it is self-defeating to be deterred from correcting a "
@@ -3335,7 +3481,7 @@
 "le perpétuent. C'est pourquoi nous continuerons à essayer de rectifier le "
 "nom incorrect."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Whatever you contributed, is it legitimate to rename the operating system? "
 "<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
@@ -3344,7 +3490,7 @@
 "d'exploitation ? <span class=\"anchor-reference-id\">(<a href=\"#rename"
 "\">#rename</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are not renaming anything; we have been calling this system &ldquo;"
 "GNU&rdquo; ever since we announced it in 1983.  The people who tried to "
@@ -3354,7 +3500,7 @@
 "première annonce en 1983. Les personnes qui ont essayé de le renommer "
 "« Linux » n'auraient pas dû le faire."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong to force people to call the system &ldquo;GNU/Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
@@ -3362,7 +3508,7 @@
 "N'est-ce pas mal de forcer les gens à appeler le système « GNU/Linux » 
? "
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong to force them, and we don't try.  We call the system "
 "&ldquo;GNU/Linux&rdquo;, and we ask you to do it too."
@@ -3371,7 +3517,7 @@
 "appelons le système « GNU/Linux » et vous demandons simplement de faire 
de "
 "même."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not sue people who call the whole system &ldquo;Linux&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
@@ -3380,7 +3526,7 @@
 "entier « Linux » ? <span class=\"anchor-reference-id\">(<a 
href=\"#whynotsue"
 "\">#whynotsue</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are no legal grounds to sue them, but since we believe in freedom of "
 "speech, we wouldn't want to do that anyway.  We ask people to call the "
@@ -3391,7 +3537,7 @@
 "Nous demandons aux gens d'appeler le système « GNU/Linux » parce que 
c'est "
 "juste de le faire."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Shouldn't you put something in the GNU GPL to require people to call the "
 "system &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id\">(<a href="
@@ -3401,13 +3547,31 @@
 "gens à appeler le système « GNU » ? <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#require\">#require</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
+# | The purpose of the GNU GPL is to protect the users' freedom from those who
+# | would make proprietary versions of free software.  While it is true that
+# | those who call the system &ldquo;Linux&rdquo; often do things that limit
+# | the users' freedom, such as bundling non[---]free software with the
+# | GNU/Linux system or even developing non[---]free software for such use,
+# | the mere act of calling the system &ldquo;Linux&rdquo; does not, in
+# | itself, deny users their freedom.  It seems improper to make the GPL
+# | restrict what name people can use for the system.
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU GPL is to protect the users' freedom from those "
+#| "who would make proprietary versions of free software.  While it is true "
+#| "that those who call the system &ldquo;Linux&rdquo; often do things that "
+#| "limit the users' freedom, such as bundling non-free software with the GNU/"
+#| "Linux system or even developing non-free software for such use, the mere "
+#| "act of calling the system &ldquo;Linux&rdquo; does not, in itself, deny "
+#| "users their freedom.  It seems improper to make the GPL restrict what "
+#| "name people can use for the system."
 msgid ""
 "The purpose of the GNU GPL is to protect the users' freedom from those who "
 "would make proprietary versions of free software.  While it is true that "
 "those who call the system &ldquo;Linux&rdquo; often do things that limit the "
-"users' freedom, such as bundling non-free software with the GNU/Linux system "
-"or even developing non-free software for such use, the mere act of calling "
+"users' freedom, such as bundling nonfree software with the GNU/Linux system "
+"or even developing nonfree software for such use, the mere act of calling "
 "the system &ldquo;Linux&rdquo; does not, in itself, deny users their "
 "freedom.  It seems improper to make the GPL restrict what name people can "
 "use for the system."
@@ -3422,7 +3586,7 @@
 "pas correct de se servir de la GPL pour limiter le choix des noms que les "
 "gens peuvent donner au système."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you objected to the original BSD license's advertising requirement to "
 "give credit to the University of California, isn't it hypocritical to demand "
@@ -3434,7 +3598,7 @@
 "hypocrite d'exiger la même chose pour le projet GNU ? <span class=\"anchor-"
 "reference-id\">(<a href=\"#BSDlicense\">#BSDlicense</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would be hypocritical to make the name GNU/Linux a license requirement, "
 "and we don't.  We only <em>ask</em> you to give us the credit we deserve."
@@ -3443,7 +3607,7 @@
 "nous ne le faisons pas. Nous vous <em>demandons</em> seulement de nous "
 "donner le crédit que nous méritons."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please note that there are at least <a href=\"/licenses/bsd.html\"> two "
 "different BSD licenses</a>.  For clarity's sake, please don't use the term "
@@ -3453,7 +3617,7 @@
 "licences BSD différentes</a>. Par souci de clarté, merci de ne pas utiliser 
"
 "l'expression « licence BSD » sans préciser de laquelle il s'agit."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you failed to put something in the GNU GPL to require people to call "
 "the system &ldquo;GNU&rdquo;, you deserve what happened; why are you "
@@ -3465,7 +3629,7 @@
 "ce que vous méritez ; pourquoi vous plaignez-vous maintenant ? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#deserve\">#deserve</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The question presupposes a rather controversial general ethical premise: "
 "that if people do not force you to treat them fairly, you are entitled to "
@@ -3477,11 +3641,11 @@
 "droit de les exploiter autant que vous le voulez. En d'autres termes, cela "
 "signifie que cela pourrait être juste."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope you disagree with that premise just as we do."
 msgstr "Nous espérons que vous rejetez ce principe autant que nous."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't you be better off not contradicting what so many people believe? "
 "<span class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)"
@@ -3491,7 +3655,7 @@
 "gens croient ? <span class=\"anchor-reference-id\">(<a href=\"#contradict"
 "\">#contradict</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't think we should go along with large numbers of people because they "
 "have been misled.  We hope you too will decide that truth is important."
@@ -3500,7 +3664,7 @@
 "a été trompée. Nous espérons que vous aussi, vous déciderez que la 
vérité "
 "est importante."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We could never have developed a free operating system without first denying "
 "the belief, held by most people, that proprietary software was legitimate "
@@ -3510,7 +3674,7 @@
 "nier la croyance générale que les logiciels privateurs étaient légitimes 
et "
 "acceptables."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
 "<span class=\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</"
@@ -3520,11 +3684,11 @@
 "raison ? <span class=\"anchor-reference-id\">(<a href=\"#somanyright"
 "\">#somanyright</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "We don't think that the popularity of an error makes it the truth."
 msgstr "Nous ne pensons pas que la popularité d'une erreur la rende juste."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it better to call the system by the name most users already know? "
 "<span class=\"anchor-reference-id\">(<a href=\"#knownname\">#knownname</a>)</"
@@ -3534,7 +3698,7 @@
 "connaissent déjà ? <span class=\"anchor-reference-id\">(<a 
href=\"#knownname"
 "\">#knownname</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo; includes "
 "&ldquo;Linux&rdquo;, they will recognize what you're talking about.  If you "
@@ -3546,7 +3710,7 @@
 "temps en temps vous ajoutez « souvent appelé à tort “Linux” », ils "
 "comprendront tous."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many people care about what's convenient or who's winning, not about "
 "arguments of right or wrong.  Couldn't you get more of their support by a "
@@ -3558,12 +3722,24 @@
 "obtenir leur soutien par d'autres moyens ? <span class=\"anchor-reference-id"
 "\">(<a href=\"#winning\">#winning</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+# | To care only about what's convenient or who's winning is an amoral
+# | approach to life.  Non[---]free software is an example of that amoral
+# | approach and thrives on it.  Thus, in the long run it would be
+# | self-defeating for us to adopt that approach.  We will continue talking in
+# | terms of right and wrong.
+#, fuzzy
+#| msgid ""
+#| "To care only about what's convenient or who's winning is an amoral "
+#| "approach to life.  Non-free software is an example of that amoral "
+#| "approach and thrives on it.  Thus, in the long run it would be self-"
+#| "defeating for us to adopt that approach.  We will continue talking in "
+#| "terms of right and wrong."
 msgid ""
 "To care only about what's convenient or who's winning is an amoral approach "
-"to life.  Non-free software is an example of that amoral approach and "
-"thrives on it.  Thus, in the long run it would be self-defeating for us to "
-"adopt that approach.  We will continue talking in terms of right and wrong."
+"to life.  Nonfree software is an example of that amoral approach and thrives "
+"on it.  Thus, in the long run it would be self-defeating for us to adopt "
+"that approach.  We will continue talking in terms of right and wrong."
 msgstr ""
 "Ne s'intéresser qu'à l'aspect pratique ou au gagnant est une approche "
 "amorale de la vie. Le logiciel non libre est un exemple de cette approche "
@@ -3571,7 +3747,7 @@
 "la défaite que de s'y plier. Nous continuerons à parler en termes de bien 
et "
 "de mal."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope that you are one of those for whom right and wrong do matter."
 msgstr ""
 "Nous espérons que vous êtes l'un de ceux pour qui le bien et le mal ont de "
@@ -3625,12 +3801,16 @@
 "traduction</a> les infos nécessaires."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
+# | Copyright &copy; [-2014, 2015, 2016, 2017, 2018, 2019-] {+2001-2011,
+# | 2013-2018, 2020, 2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+#| "Foundation, Inc."
+msgid ""
+"Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation, "
+"Inc."
+msgstr "Copyright &copy; 2014-2019 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -3654,3 +3834,10 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
+
+#~ msgid ""
+#~ "Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
+#~ "Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
+#~ "Free Software Foundation, Inc."

Index: gnu/po/gnu-linux-faq.hr-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.hr-diff.html,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- gnu/po/gnu-linux-faq.hr-diff.html   30 May 2021 19:32:26 -0000      1.37
+++ gnu/po/gnu-linux-faq.hr-diff.html   30 Aug 2021 13:34:53 -0000      1.38
@@ -10,35 +10,34 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.75</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.75</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;GNU/Linux FAQ
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/gnu/po/gnu-linux-faq.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;GNU/Linux FAQ 
by</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;GNU/Linux FAQ&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;GNU/Linux <span class="removed"><del><strong>FAQ 
by</strong></del></span> <span class="inserted"><ins><em>FAQ&lt;/h2&gt;
 
-&lt;address class="byline c"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;</strong></del></span> <span 
class="inserted"><ins><em>Stallman&lt;/address&gt;
+&lt;address class="byline"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;
 
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;To</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;To</em></ins></span> learn more about 
this issue, you can also read
+  &lt;blockquote&gt;&lt;p&gt;To learn more about this issue, you can also read
 our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
Project&lt;/a&gt;, our
  page on &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;
 and our page on &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU
-Users Who Have Never Heard of <span 
class="removed"><del><strong>GNU&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;</strong></del></span>
 <span class="inserted"><ins><em>GNU&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
-&lt;/div&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;
+Users Who Have Never Heard of GNU&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span> <span 
class="inserted"><ins><em>Stallman&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;
 When people see that we use and recommend the name GNU/Linux for a
 system that many others call just &ldquo;Linux&rdquo;, they ask many questions.
 Here are common questions, and our answers.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;div class="toc"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;h3 class="no-display"&gt;Table of Contents&lt;/h3&gt;</em></ins></span>
 &lt;ul&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#why" 
id="TOCwhy"&gt;Why</strong></del></span> <span 
class="inserted"><ins><em>href="#why"&gt;Why</em></ins></span> do you call 
<span class="removed"><del><strong>it</strong></del></span> <span 
class="inserted"><ins><em>the system we use</em></ins></span> GNU/Linux and not 
Linux?&lt;/a&gt;&lt;/li&gt;
@@ -299,7 +298,16 @@
     get more of their support by a different road?&lt;/a&gt;&lt;/li&gt;
 
 &lt;/ul&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;/div&gt;
+
+&lt;div class="announcement comment" role="complementary"&gt;
+&lt;p&gt;To learn more about this issue, you can also read
+our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
System&lt;/a&gt;, our
+ page on &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;
+and our page on &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU
+Users Who Have Never Heard of GNU&lt;/a&gt;.&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;</em></ins></span>
 
 &lt;dl&gt;
 
@@ -340,10 +348,13 @@
 
 &lt;dt <span class="inserted"><ins><em>id="what"&gt;What is the real 
relationship between GNU and Linux? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#what"&gt;#what&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
-&lt;dd&gt;The GNU operating system and the Linux kernel are separate
+&lt;dd&gt;
+&lt;p&gt;
+The GNU operating system and the Linux kernel are separate
 software projects that do complementary jobs.  Typically they are
 packaged in a &lt;a href="/distros/distros.html"&gt;GNU/Linux 
distribution&lt;/a&gt;, and used
-together.&lt;/dd&gt;
+together.&lt;/p&gt;
+&lt;/dd&gt;
 
 &lt;dt</em></ins></span> id="howerror"&gt;How did it come about that most
     people call the system &ldquo;Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#howerror"&gt;#howerror&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
@@ -456,11 +467,12 @@
           support an individual's free speech rights to call the system by
           any name that individual chooses? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#freespeech"&gt;#freespeech&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Yes, indeed, we believe you have a free speech right to call the
 operating system by any name you wish.  We ask that people call it
 GNU/Linux as a matter of doing justice to the GNU project, to promote
 the values of freedom that GNU stands for, and to inform others that
-those values of freedom brought the system into existence.
+those values of freedom brought the system into <span 
class="removed"><del><strong>existence.</strong></del></span> <span 
class="inserted"><ins><em>existence.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="everyoneknows"&gt;Since everyone knows
@@ -491,11 +503,12 @@
     why does it matter what name I use? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#everyoneknows2"&gt;#everyoneknows2&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 If your words don't reflect your knowledge, you don't teach others.
 Most people who have heard of the GNU/Linux system think it is
 &ldquo;Linux&rdquo;, that it was started by Linus Torvalds, and that
 it was intended to be &ldquo;open source&rdquo;.  If you don't tell
-them, who will?
+them, who <span class="removed"><del><strong>will?</strong></del></span> <span 
class="inserted"><ins><em>will?&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="windows"&gt;Isn't shortening &ldquo;GNU/Linux&rdquo;
@@ -602,19 +615,21 @@
 &lt;dt id="brain"&gt;Isn't the kernel the brain of the system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#brain"&gt;#brain&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 A computer system is not much like a human body,
 and no part of it plays a role comparable to that of
-the brain in a human.
+the brain in a <span class="removed"><del><strong>human.</strong></del></span> 
<span class="inserted"><ins><em>human.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="kernelmost"&gt;Isn't writing the kernel most of the work in an
 operating system? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#kernelmost"&gt;#kernelmost&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-No, many components take a lot of work.
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
+No, many components take a lot of <span 
class="removed"><del><strong>work.</strong></del></span> <span 
class="inserted"><ins><em>work.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="nokernel"&gt;An operating system 
requires a kernel.
+&lt;dt id="nokernel"&gt;An operating system requires a kernel.
     Since the GNU Project didn't develop a kernel, how can
     the system be GNU?&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#nokernel"&gt;#nokernel&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -671,10 +686,10 @@
 &lt;p&gt;
 We never took the last step of packaging GNU under the name
 &ldquo;GNU&rdquo;, but that doesn't alter what kind of thing GNU is.
-GNU is an operating system.&lt;/p&gt;
+GNU is an operating system.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="afterkernel"&gt;We're calling the
+&lt;dt id="afterkernel"&gt;We're calling the
     whole system after the kernel, Linux.  Isn't it normal to name an
     operating system after a kernel? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#afterkernel"&gt;#afterkernel&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -697,11 +712,12 @@
     feel of Linux&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#feel"&gt;#feel&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+&lt;p&gt;
 There is no such thing as the &ldquo;feel of Linux&rdquo; because
 Linux has no user interfaces.  Like any modern kernel, Linux is a base
 for running programs; user interfaces belong elsewhere in the system.
 Human interaction with GNU/Linux always goes through other programs,
-and the &ldquo;feel&rdquo; comes from them.
+and the &ldquo;feel&rdquo; comes from them.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt</em></ins></span> id="long"&gt;The problem with &ldquo;GNU/Linux&rdquo; 
is that it is too long.
@@ -792,7 +808,8 @@
 may simply not recognize we're talking about the same system.  If we
 say &ldquo;GNU/Linux&rdquo;, they can make a connection to what they have heard
 about.&lt;/li&gt;
-&lt;/ul&gt;&lt;p&gt;&lt;/p&gt;
+<span 
class="removed"><del><strong>&lt;/ul&gt;&lt;p&gt;&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/ul&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="trademarkfee"&gt;I would have
@@ -846,11 +863,12 @@
     GNU/systemd/Linux? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#others"&gt;#others&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+&lt;p&gt;
 systemd is a fairly important component, but not as important as the
 kernel (Linux), nor as important as the basis of the system as a whole
 (GNU).  However, if you want to emphasize the presence of systemd
 by calling the system &ldquo;GNU/systemd/Linux&rdquo;, there is nothing
-wrong with doing so.
+wrong with doing so.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt</em></ins></span> id="others"&gt;Many other projects contributed to
@@ -922,8 +940,8 @@
 &lt;p&gt;
 We're not talking about a distinct GNU version of Linux, the kernel.
 The free GNU/Linux distros do have
-a &lt;a href="http://directory.fsf.org/project/linux"&gt;separate version of
-Linux&lt;/a&gt;, since the &ldquo;standard&rdquo; version contains non-free
+a &lt;a <span 
class="removed"><del><strong>href="http://directory.fsf.org/project/linux"&gt;separate</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://directory.fsf.org/wiki/Linux-libre"&gt;separate</em></ins></span>
 version of
+Linux&lt;/a&gt;, since the &ldquo;standard&rdquo; version contains <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
 firmware &ldquo;blobs&rdquo;.  If this were part of the GNU Project,
 it could be considered &ldquo;GNU Linux&rdquo;; but we would not want
 to call it that, because it would be too confusing.&lt;/p&gt;
@@ -1047,13 +1065,13 @@
     free software?  After all, that is the ideal of GNU. &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#reserve"&gt;#reserve&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-The widespread practice of adding non-free software to the GNU/Linux
+The widespread practice of adding <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software to the GNU/Linux
 system is a major problem for our community.  It teaches the users
-that non-free software is ok, and that using it is part of the spirit
+that <span class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software is ok, and that 
using it is part of the spirit
 of &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of 
their mission to
-help users use non-free add-ons, and may even invite salesmen to come
+help users use <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> add-ons, and may even 
invite salesmen to come
 and make sales pitches for them.  They adopt goals such as &ldquo;helping
-the users&rdquo; of GNU/Linux (including helping them use non-free
+the users&rdquo; of GNU/Linux (including helping them use <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
 applications and drivers), or making the system more popular even at
 the cost of freedom.
 &lt;p&gt;
@@ -1071,7 +1089,7 @@
 versions &lt;em&gt;are&lt;/em&gt; versions of GNU, that they all are based on a
 system that exists specifically for the sake of the users' freedom.
 With this understanding, they can start to recognize the distributions
-that include non-free software as perverted, adulterated versions of
+that include <span class="removed"><del><strong>non-free</strong></del></span> 
<span class="inserted"><ins><em>nonfree</em></ins></span> software as 
perverted, adulterated versions of
 GNU, instead of thinking they are proper and appropriate &ldquo;versions of
 Linux&rdquo;.&lt;/p&gt;
 &lt;p&gt;
@@ -1224,7 +1242,7 @@
 (there were already many of them, for various systems), but instead of
 calling it by a dull name like &ldquo;&lt;em&gt;somethingorother&lt;/em&gt; 
TECO&rdquo;, he
 thought of a clever amusing name.  (That's what hacking
-means: &lt;a href="http://stallman.org/articles/on-hacking.html"&gt;playful
+means: &lt;a <span 
class="removed"><del><strong>href="http://stallman.org/articles/on-hacking.html"&gt;playful</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://stallman.org/articles/on-hacking.html"&gt;playful</em></ins></span>
 cleverness&lt;/a&gt;.)&lt;/p&gt;
 &lt;p&gt;
 Other hackers enjoyed that name so much that we imitated the approach.
@@ -1250,7 +1268,7 @@
 We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems,
 because that term does not fit the history of the BSD systems.
 &lt;p&gt;
-The BSD system was developed by UC Berkeley as non-free software in
+The BSD system was developed by UC Berkeley as <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software in
 the 80s, and became free in the early 90s.  A free operating system
 that exists today is almost certainly either a variant of the GNU
 system, or a kind of BSD system.&lt;/p&gt;
@@ -1281,25 +1299,27 @@
 on Windows, does that mean I am running a GNU/Windows system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#othersys"&gt;#othersys&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of 
GNU
 are just a part of the GNU software, which is just a part of the GNU
 system, and underneath them you would still have another complete
 operating system which has no code in common with GNU.  All in all,
-that's a very different situation from GNU/Linux.
+that's a very different situation from <span 
class="removed"><del><strong>GNU/Linux.</strong></del></span> <span 
class="inserted"><ins><em>GNU/Linux.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="justlinux"&gt;Can't Linux be used without GNU? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#justlinux"&gt;#justlinux&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Linux is used by itself, or with small other programs, in some
 appliances.  These small software systems are a far cry from the
 GNU/Linux system.  Users do not install them on PCs, for instance, and
 would find them rather disappointing.  It is useful to say that these
 appliances run just Linux, to show how different those small platforms
-are from GNU/Linux.
+are from <span class="inserted"><ins><em>GNU/Linux.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="howmuch"&gt;How much of the GNU 
system is needed for the system
+&lt;dt id="howmuch"&gt;How much of the GNU system is needed for the system
 to be
 GNU/Linux? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#howmuch"&gt;#howmuch&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -1310,17 +1330,17 @@
 GNU is an operating system maintained by a community.  It includes far
 more than just the GNU software packages (of which we have a specific
 list), and people add more packages constantly.  Despite these
-changes, it remains the GNU system, and adding Linux to that yields
-GNU/Linux.  If you use part of the GNU system and omit part, there is
+changes, it remains the GNU system, and adding Linux to that 
yields</em></ins></span>
+GNU/Linux.  <span class="inserted"><ins><em>If you use part of the GNU system 
and omit part, there is
 no meaningful way to say &ldquo;how much&rdquo; you used.&lt;/p&gt;
 &lt;p&gt;
 If we look at the level of packages, Linux is one important package in
 the GNU/Linux system.  The inclusion of one important GNU package is
 enough to justify our request for equal mention.
-&lt;/p&gt;
+&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="linuxsyswithoutgnu"&gt;Are there complete Linux 
systems <span class="inserted"><ins><em>[sic]</em></ins></span> without GNU? 
&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#linuxsyswithoutgnu"&gt;#linuxsyswithoutgnu&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+&lt;dt id="linuxsyswithoutgnu"&gt;Are there complete Linux systems <span 
class="inserted"><ins><em>[sic]</em></ins></span> without GNU? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#linuxsyswithoutgnu"&gt;#linuxsyswithoutgnu&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
 There are complete systems that contain Linux and not GNU; Android is
@@ -1389,10 +1409,11 @@
 &ldquo;Linux&rdquo; with that principle.
 &lt;p&gt;
 Linus publicly states his disagreement with the free software
-movement's ideals.  He developed non-free software in his job for many
+movement's ideals.  He developed <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software in his job for many
 years (and said so to a large audience at a &ldquo;Linux&rdquo;World show), and
 publicly invited fellow developers of Linux, the kernel, to use
-non-free software to work on it with him.  He goes even further, and
+<span class="removed"><del><strong>non-free</strong></del></span>
+<span class="inserted"><ins><em>nonfree</em></ins></span> software to work on 
it with him.  He goes even further, and
 rebukes people who suggest that engineers and scientists should
 consider social consequences of our technical work&mdash;rejecting the
 lessons society learned from the development of the atom bomb.&lt;/p&gt;
@@ -1411,11 +1432,13 @@
     work as GNU? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#claimlinux"&gt;#claimlinux&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 It would be wrong, so we don't do that.  Torvalds' work is Linux, the
 kernel; we are careful not to attribute that work to the GNU Project
 or label it as &ldquo;GNU&rdquo;.  When we talk about the whole
 system, the name &ldquo;GNU/Linux&rdquo; gives him a share of the
-credit.
+<span class="removed"><del><strong>credit.</strong></del></span>
+<span class="inserted"><ins><em>credit.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 
@@ -1425,7 +1448,8 @@
 &lt;dd&gt;
 &lt;p&gt;He recognized this at the beginning.  The earliest Linux release notes
 said, &lt;a
-href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+<span 
class="removed"><del><strong>href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
 &ldquo;Most of the tools used with linux are GNU software and are under the
 GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
 for more info&rdquo;&lt;/a&gt;.&lt;/p&gt;
@@ -1443,7 +1467,7 @@
 a big job, and it's not clearly necessary.  The only thing ethically
 wrong with Linux as a kernel is its inclusion of firmware
 &ldquo;blobs&rdquo;; the best fix for that problem
-is &lt;a href="http://fsf.org/campaigns/priority-projects"&gt; developing
+is &lt;a href="https://www.fsf.org/campaigns/priority-projects"&gt; developing
 free replacement for the blobs&lt;/a&gt;.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -1452,12 +1476,13 @@
     it? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#lost"&gt;#lost&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 This isn't a battle, it is a campaign of education.  What to call the
 system is not a single decision, to be made at one moment by
 &ldquo;society&rdquo;: each person, each organization, can decide what
 name to use.  You can't make others say &ldquo;GNU/Linux&rdquo;, but
 you can decide to call the system &ldquo;GNU/Linux&rdquo;
-yourself&mdash;and by doing so, you will help educate others.
+yourself&mdash;and by doing so, you will help educate <span 
class="removed"><del><strong>others.</strong></del></span> <span 
class="inserted"><ins><em>others.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="whatgood"&gt;Society has made its
@@ -1465,6 +1490,7 @@
     &ldquo;GNU/Linux&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#whatgood"&gt;#whatgood&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 This is not an all-or-nothing situation: correct and incorrect
 pictures are being spread more or less by various people.  If you call
 the system &ldquo;GNU/Linux&rdquo;, you will help others learn the system's 
true
@@ -1472,7 +1498,7 @@
 everywhere on your own, any more than we can, but you can help.  If
 only a few hundred people see you use the term &ldquo;GNU/Linux&rdquo;, you 
will
 have educated a substantial number of people with very little work.
-And some of them will spread the correction to others.
+And some of them will spread the correction to <span 
class="removed"><del><strong>others.</strong></del></span> <span 
class="inserted"><ins><em>others.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="explain"&gt;Wouldn't it be better to call
@@ -1543,39 +1569,44 @@
     is it legitimate to rename the operating system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#rename"&gt;#rename&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 We are not renaming anything; we have been calling this system 
&ldquo;GNU&rdquo;
 ever since we announced it in 1983.  The people who tried to rename
-it to &ldquo;Linux&rdquo; should not have done so.&lt;/dd&gt;
+it to &ldquo;Linux&rdquo; should not have done <span 
class="removed"><del><strong>so.&lt;/dd&gt;</strong></del></span> <span 
class="inserted"><ins><em>so.&lt;/p&gt;
+&lt;/dd&gt;</em></ins></span>
 
 &lt;dt id="force"&gt;Isn't it wrong to force people to call
 the system &ldquo;GNU/Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#force"&gt;#force&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 It would be wrong to force them, and we don't try.  We call the system
-&ldquo;GNU/Linux&rdquo;, and we ask you to do it too.
+&ldquo;GNU/Linux&rdquo;, and we ask you to do it <span 
class="removed"><del><strong>too.</strong></del></span> <span 
class="inserted"><ins><em>too.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="whynotsue"&gt;Why not sue people who call
 the whole system &ldquo;Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#whynotsue"&gt;#whynotsue&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 There are no legal grounds to sue them, but since we believe in
 freedom of speech, we wouldn't want to do that anyway.  We ask people
-to call the system &ldquo;GNU/Linux&rdquo; because that is the right thing to 
do.
+to call the system &ldquo;GNU/Linux&rdquo; because that is the right thing to 
<span class="removed"><del><strong>do.</strong></del></span> <span 
class="inserted"><ins><em>do.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="require"&gt;Shouldn't you put something in
     the GNU GPL to require people to call the system &ldquo;GNU&rdquo;? 
&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#require"&gt;#require&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 The purpose of the GNU GPL is to protect the users' freedom from those
 who would make proprietary versions of free software.  While it is
 true that those who call the system &ldquo;Linux&rdquo; often do things that 
limit
-the users' freedom, such as bundling non-free software with the
-GNU/Linux system or even developing non-free software for such use,
+the users' freedom, such as bundling <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software with the
+GNU/Linux system or even developing <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software for such use,
 the mere act of calling the system &ldquo;Linux&rdquo; does not, in itself, 
deny
 users their freedom.  It seems improper to make the GPL restrict what
-name people can use for the system.
+name people can use for the <span 
class="removed"><del><strong>system.</strong></del></span> <span 
class="inserted"><ins><em>system.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="BSDlicense"&gt;Since you objected to the original BSD license's
@@ -1623,27 +1654,29 @@
 it &ldquo;Linux&rdquo;, doesn't that make it right? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#somanyright"&gt;#somanyright&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-We don't think that the popularity of an error makes it the truth.
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
+We don't think that the popularity of an error makes it the <span 
class="removed"><del><strong>truth.</strong></del></span> <span 
class="inserted"><ins><em>truth.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="knownname"&gt;Isn't it better to 
call the
+&lt;dt id="knownname"&gt;Isn't it better to call the
     system by the name most users already know? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#knownname"&gt;#knownname&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+&lt;p&gt;
 Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo;
 includes &ldquo;Linux&rdquo;, they will recognize what you're talking
 about.  If you add &ldquo;(often erroneously referred to as
-&lsquo;Linux&rsquo;)&rdquo; once in a while, they will all understand.
+&lsquo;Linux&rsquo;)&rdquo; once in a while, they will all 
understand.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="winning"&gt;Many people care about what's
+&lt;dt id="winning"&gt;Many people care about what's
     convenient or who's winning, not about arguments of right or wrong.
     Couldn't you get more of their support by a different
     road? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#winning"&gt;#winning&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
 To care only about what's convenient or who's winning is an amoral
-approach to life.  Non-free software is an example of that amoral
+approach to life.  <span 
class="removed"><del><strong>Non-free</strong></del></span>  <span 
class="inserted"><ins><em>Nonfree</em></ins></span> software is an example of 
that amoral
 approach and thrives on it.  <span 
class="removed"><del><strong>So</strong></del></span>  <span 
class="inserted"><ins><em>Thus,</em></ins></span> in the long run it <span 
class="removed"><del><strong>is</strong></del></span> <span 
class="inserted"><ins><em>would be</em></ins></span>
 self-defeating for us to <span class="removed"><del><strong>bow 
to</strong></del></span> <span 
class="inserted"><ins><em>adopt</em></ins></span> that approach.  We will 
continue
 talking in terms of right and wrong.
@@ -1652,8 +1685,7 @@
 &lt;/dd&gt;
 
 &lt;/dl&gt;
-<span class="inserted"><ins><em>&lt;/div&gt;
-&lt;/div&gt;</em></ins></span>
+<span class="inserted"><ins><em>&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;
@@ -1702,7 +1734,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2001, <span class="removed"><del><strong>2006, 2007, 
2008,</strong></del></span> <span 
class="inserted"><ins><em>2006-2008,</em></ins></span> 2010, 2011, <span 
class="removed"><del><strong>2013</strong></del></span> <span 
class="inserted"><ins><em>2013, 2014-2018, 2020, 2021</em></ins></span>
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>2001, 2006, 2007, 
2008, 2010, 2011, 2013</strong></del></span> <span 
class="inserted"><ins><em>2001-2011, 2013-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"
@@ -1716,7 +1748,7 @@
 
 <span class="inserted"><ins><em>&lt;p 
class="unprintable"&gt;Updated:</em></ins></span>
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/30 19:32:26 $
+$Date: 2021/08/30 13:34:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: gnu/po/gnu-linux-faq.hr.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.hr.po,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- gnu/po/gnu-linux-faq.hr.po  30 May 2021 19:32:26 -0000      1.43
+++ gnu/po/gnu-linux-faq.hr.po  30 Aug 2021 13:34:53 -0000      1.44
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2013-05-30 22:45+0100\n"
 "Last-Translator: Martina Bebek <martinaporec@gmail.com>\n"
 "Language-Team: GNU Croatian Translation Team <www-hr-lista@gnu.org>\n"
@@ -24,32 +24,18 @@
 msgid "GNU/Linux FAQ - GNU Project - Free Software Foundation"
 msgstr "ČPP o GNU/Linuxu - Projekt GNU - Zaklada za slobodan softver"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU/Linux FAQ"
 msgstr ""
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 # | {+by+} Richard Stallman
 #, fuzzy
 #| msgid "Richard Stallman"
 msgid "by Richard Stallman"
 msgstr "Richard Stallman"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
-"linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a href=\"/"
-"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Ukoliko želite saznati više o ovoj temi, možete pročitati našu stranicu 
<a "
-"href=\"/gnu/linux-and-gnu.html\">Linux i projekt GNU</a>, našu stranicu <a "
-"href=\"/gnu/why-gnu-linux.html\">Zašto GNU/Linux?</a> i našu stranicu <a "
-"href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU korisnici koji nisu "
-"nikada čuli za GNU</a>"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When people see that we use and recommend the name GNU/Linux for a system "
 "that many others call just &ldquo;Linux&rdquo;, they ask many questions.  "
@@ -59,6 +45,13 @@
 "koji mnogi drugi nazivaju samo &ldquo;Linux&rdquo;, počnu postavljati mnoga "
 "pitanja. Ovdje se nalaze najčešća pitanja i naši odgovori."
 
+#. type: Content of: <div><div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "Sadržaj"
+
 #. type: Content of: <div><div><ul><li>
 # | <a href=\"#why\">Why do you call [-it-] {+the system we use+} GNU/Linux
 # | and not Linux?</a>
@@ -662,7 +655,34 @@
 "pobjeđuje, a ne mare za rasprave o pravom ili krivom. Ne biste li imali 
više "
 "podrške da probate na drugačiji način?</a>"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
+# | {+System</a>,+} our page on <a href=\"/gnu/why-gnu-linux.html\">Why
+# | GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our page on <a href=\"/"
+#| "gnu/linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a "
+#| "href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
+"linux-and-gnu.html\">Linux and the GNU System</a>, our page on <a href=\"/"
+"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Ukoliko želite saznati više o ovoj temi, možete pročitati našu stranicu 
<a "
+"href=\"/gnu/linux-and-gnu.html\">Linux i projekt GNU</a>, našu stranicu <a "
+"href=\"/gnu/why-gnu-linux.html\">Zašto GNU/Linux?</a> i našu stranicu <a "
+"href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU korisnici koji nisu "
+"nikada čuli za GNU</a>"
+
+#. type: Content of: <div><dl><dt>
 # | Why do you call [-it-] {+the system we use+} GNU/Linux and not Linux?
 # | <span class=\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>
 #, fuzzy
@@ -676,7 +696,7 @@
 "Zašto naziv GNU/Linux a ne Linux? <span class=\"anchor-reference-id\">(<a "
 "href=\"#why\">#why</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Most operating system distributions based on Linux as kernel are basically "
 "modified versions of the GNU operating system.  We began developing GNU in "
@@ -694,11 +714,11 @@
 "centralnih komponenti koje čine najveći jedinstveni doprinos cijelom "
 "sustavu. Osnovna vizija je također bila naša."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "In fairness, we ought to get at least equal mention."
 msgstr "Pošteno bi bilo da budemo barem jednako spomenuti."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and the GNU System</a> and <a "
 "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
@@ -710,7 +730,7 @@
 "za GNU</a>za detaljnije objašnjenje, te <a href=\"/gnu/the-gnu-project.html"
 "\">Projekt GNU</a> za povijest."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why is the name important? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
@@ -718,7 +738,7 @@
 "Zašto je naziv važan? <span class=\"anchor-reference-id\">(<a 
href=\"#whycare"
 "\">#whycare</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Although the developers of Linux, the kernel, are contributing to the free "
 "software community, many of them do not care about freedom.  People who "
@@ -732,7 +752,7 @@
 "povijesti naše zajednice koje ti razvijatelji nisu odigrali i njihovim "
 "pogledima dodaju preveliku težinu."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Calling the system GNU/Linux recognizes the role that our idealism played in "
 "building our community, and <a href=\"/gnu/why-gnu-linux.html\">helps the "
@@ -742,20 +762,20 @@
 "stvaranju zajednice i <a href=\"/gnu/why-gnu-linux.html\">pomaže javnosti da 
"
 "prepozna praktičnu važnost tih ideala</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the real relationship between GNU and Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#what\">#what</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU operating system and the Linux kernel are separate software projects "
 "that do complementary jobs.  Typically they are packaged in a <a href=\"/"
 "distros/distros.html\">GNU/Linux distribution</a>, and used together."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How did it come about that most people call the system &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
@@ -764,7 +784,7 @@
 "Kako to da većina ljudi sustav zove &ldquo;Linuxom&rdquo;?<span class="
 "\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; is a confusion that has spread faster "
 "than the corrective information."
@@ -772,7 +792,7 @@
 "Nazivanje sustava &ldquo;Linuxom&rdquo; jest zbunjenost koja se proširila "
 "brže od ispravne informacije."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who combined Linux with the GNU system were not aware that that's "
 "what their activity amounted to.  They focused their attention on the piece "
@@ -790,7 +810,7 @@
 "zatražimo od ljudi da promijene naviku, no tada je zbunjenost već imala "
 "veliku prednost."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the people who call the system &ldquo;Linux&rdquo; have never heard "
 "why that's not the right thing.  They saw others using that name and assume "
@@ -807,7 +827,7 @@
 "da je razvoj započeo s Linusom Torvaldsom 1991. Ova pogrešna slika samo 
jača "
 "ideju da bi se sustav trebao zvati &ldquo;Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Many of the questions in this file represent people's attempts to justify "
 "the name they are accustomed to using."
@@ -815,7 +835,7 @@
 "Mnoga od pitanja u ovome tekstu predstavljaju načine na koje su ljudi "
 "pokušali opravdati naziv koji su navikli koristiti."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we always say &ldquo;GNU/Linux&rdquo; instead of &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
@@ -823,7 +843,7 @@
 "Trebamo li uvijek reći &ldquo;GNU/Linux&rdquo; umjesto &ldquo;Linux&rdquo;?"
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not always&mdash;only when you're talking about the whole system.  When "
 "you're referring specifically to the kernel, you should call it &ldquo;"
@@ -833,7 +853,7 @@
 "specifično o jezgri, trebate ju zvati &ldquo;Linux&rdquo; što je naziv koji 
"
 "je razvijatelj odabrao."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
 "call the whole system by the same name as the kernel.  This causes many "
@@ -848,7 +868,7 @@
 "Nazivanjem sustava &ldquo;GNU/Linux&rdquo;, a jezgre &ldquo;Linux&rdquo;, "
 "izbjegavate dvosmislenost."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Would Linux have achieved the same success if there had been no GNU? <span "
 "class=\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</"
@@ -857,7 +877,7 @@
 "Bi li Linux bio jednako uspješan da nije bilo GNU-a?<span class=\"anchor-"
 "reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In that alternative world, there would be nothing today like the GNU/Linux "
 "system, and probably no free operating system at all.  No one attempted to "
@@ -872,7 +892,7 @@
 "kompjuterskih sustava), koju je pak Projekt GNU zatražio da počne 
oslobađati "
 "svoj kod."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds was partly influenced by a speech about GNU in Finland in "
 "1990.  It's possible that even without this influence he might have written "
@@ -886,7 +906,7 @@
 "kada ga je Linus objavio pod licencom GNU GPL. (Vidi obavijesti uz izdanje "
 "za verziju 0.12.) "
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Even if Torvalds had released Linux under some other free software license, "
 "a free kernel alone would not have made much difference to the world.  The "
@@ -898,7 +918,7 @@
 "potječe iz njegovog uklapanja u veći okvir, potpuno slobodan operativni "
 "sustav: GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better for the community if you did not divide people with "
 "this request? <span class=\"anchor-reference-id\">(<a href=\"#divide"
@@ -907,7 +927,7 @@
 "Ne bi li bilo bolje za zajednicu da ne razdvajate ljude ovim zahtjevom? "
 "<span class=\"anchor-reference-id\">(<a href=\"#divide\">#divide</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
 "people.  We are asking them to give the GNU Project credit for the GNU "
@@ -917,7 +937,7 @@
 "nego tražimo da Projektu GNU daju priznanje za operativni sustav GNU. Ovo ne 
"
 "kritizira niti udaljava ikoga."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, there are people who do not like our saying this.  Sometimes those "
 "people push us away in response.  On occasion they are so rude that one "
@@ -931,7 +951,7 @@
 "šutjeli. Nas to ne ušutkava, no dijeli zajednicu, te se nadamo da ih 
možete "
 "uvjeriti da prestanu."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, this is only a secondary cause of division in our community.  The "
 "largest division in the community is between people who appreciate free "
@@ -947,7 +967,7 @@
 "prednosti i predstavljaju slobodni softver samo kao efikasan razvojni model "
 "(tj. pokret za softver otvorenog koda)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This disagreement is not just a matter of names&mdash;it is a matter of "
 "differing basic values.  It is essential for the community to see and think "
@@ -963,7 +983,7 @@
 "misses-the-point.html\">Zašto otvoreni izvorni kod promašuje bit slobodnog "
 "softvera</a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The disagreement over values partially aligns with the amount of attention "
 "people pay to the GNU Project's role in our community.  People who value "
@@ -987,7 +1007,7 @@
 "slobodu, uspijemo uvjeriti sve ostale (što neće biti lako) ili ako budemo u 
"
 "potpunosti poraženi (što se nadamo da se neće dogoditi)."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Doesn't the GNU project support an individual's free speech rights to call "
 "the system by any name that individual chooses? <span class=\"anchor-"
@@ -997,7 +1017,7 @@
 "nazivati sustav kako god želi?  <span class=\"anchor-reference-id\">(<a 
href="
 "\"#freespeech\">#freespeech</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Yes, indeed, we believe you have a free speech right to call the operating "
 "system by any name you wish.  We ask that people call it GNU/Linux as a "
@@ -1011,7 +1031,7 @@
 "koja stoji iza GNU-a, te kako biste upoznali druge s tim vrijednostima "
 "slobode koje su iznjedrile ovaj sustav."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since everyone knows the role of GNU in developing the system, doesn't the "
 "&ldquo;GNU/&rdquo; in the name go without saying? <span class=\"anchor-"
@@ -1021,7 +1041,7 @@
 "u nazivu podrazumijevano? <span class=\"anchor-reference-id\">(<a href="
 "\"#everyoneknows\">#everyoneknows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Experience shows that the system's users, and the computer-using public in "
 "general, often know nothing about the GNU system.  Most articles about the "
@@ -1035,7 +1055,7 @@
 "Detaljnije objašnjenje u <a href=\"/gnu/gnu-users-never-heard-of-gnu.html"
 "\">GNU korisnici koji nisu nikada čuli za GNU</a>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who say this are probably geeks thinking of the geeks they know.  "
 "Geeks often do know about GNU, but many have a completely wrong idea of what "
@@ -1048,7 +1068,7 @@
 "veliki broj njih smatra da je GNU skup <a href=\"#tools\">&ldquo;alata&rdquo;"
 "</a> ili projekt za razvoj tih alata."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The wording of this question, which is typical, illustrates another common "
 "misconception.  To speak of &ldquo;GNU's role&rdquo; in developing something "
@@ -1061,7 +1081,7 @@
 "GNU skupina ljudi. GNU je operativni sustav. Bilo bi smisleno razgovarati o "
 "ulozi Projekta GNU u ovoj ili onoj aktivnosti, ali ne o ulozi GNU-a."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since I know the role of GNU in this system, why does it matter what name I "
 "use? <span class=\"anchor-reference-id\">(<a href="
@@ -1071,7 +1091,7 @@
 "<span class=\"anchor-reference-id\">(<a href="
 "\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your words don't reflect your knowledge, you don't teach others.  Most "
 "people who have heard of the GNU/Linux system think it is &ldquo;"
@@ -1083,7 +1103,7 @@
 "Linux&rdquo;, da ga je pokrenuo Linus Torvalds i da je trebao biti &ldquo;"
 "otvorenog koda&rdquo;. Ako ih vi ne razuvjerite, tko će?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't shortening &ldquo;GNU/Linux&rdquo; to &ldquo;Linux&rdquo; just like "
 "shortening &ldquo;Microsoft Windows&rdquo; to &ldquo;Windows&rdquo;? <span "
@@ -1094,7 +1114,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#windows\">#windows</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It's useful to shorten a frequently-used name, but not if the abbreviation "
 "is misleading."
@@ -1102,7 +1122,7 @@
 "Jest korisno pokratiti često korišten naziv, ali ne ukoliko skraćenica "
 "zavarava."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Almost everyone in developed countries really does know that the &ldquo;"
 "Windows&rdquo; system is made by Microsoft, so shortening &ldquo;Microsoft "
@@ -1116,7 +1136,7 @@
 "Kraćenje naziva &ldquo;GNU/Linux&rdquo; u &ldquo;Linux&rdquo; daje krive "
 "informacije o porijeklu sustava."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The question is itself misleading because GNU and Microsoft are not the same "
 "kind of thing.  Microsoft is a company; GNU is an operating system."
@@ -1124,7 +1144,7 @@
 "Čak i samo pitanje je pogrešno zato što GNU i Microsoft nisu ista stvar. "
 "Microsoft je tvrtka, GNU je operativni sustav."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't GNU a collection of programming tools that were included in Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
@@ -1132,7 +1152,7 @@
 " Nije li GNU skup programerskih alata uključenih u Linux?<span class="
 "\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "People who think that Linux is an entire operating system, if they hear "
 "about GNU at all, often get a wrong idea of what GNU is.  They may think "
@@ -1149,7 +1169,7 @@
 "popularni. Ideju da je &ldquo;GNU&rdquo; naziv operativnog sustava je teško "
 "smjestiti u okvir gdje je taj operativni sustav nazvan &ldquo;Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Project was named after the GNU operating system&mdash;it's the "
 "project to develop the GNU system.  (See <a href=\"/gnu/initial-announcement."
@@ -1159,7 +1179,7 @@
 "razvija sustav GNU. (Vidi <a href=\"/gnu/initial-announcement.html\">Prvotna "
 "najava 1983.</a>.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We developed programs such as GCC, GNU Emacs, GAS, GLIBC, BASH, etc., "
 "because we needed them for the GNU operating system.  GCC, the GNU Compiler "
@@ -1173,7 +1193,7 @@
 "za operativni sustav GNU. Mi, ljudi koji radimo u Projektu GNU, za sustav "
 "GNU smo razvili i Ghostscript, GNUCash, GNU Chess i GNOME za sustav GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the difference between an operating system and a kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
@@ -1181,7 +1201,7 @@
 "Koja je razlika između operativnog sustava i jezgre?<span class=\"anchor-"
 "reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "An operating system, as we use the term, means a collection of programs that "
 "are sufficient to use the computer to do a wide variety of jobs.  A general "
@@ -1192,7 +1212,7 @@
 "dostatni da bi računalo obavilo razne zadatke. Operativni sustav opće "
 "namjene bi trebao moći obaviti sve poslove koje korisnici žele."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The kernel is one of the programs in an operating system&mdash;the program "
 "that allocates the machine's resources to the other programs that are "
@@ -1202,7 +1222,7 @@
 "dodjeljuje resurse računala drugim aktivnim programima. Jezgra se također "
 "brine o pokretanju i zaustavljanju drugih programa."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "To confuse matters, some people use the term &ldquo;operating system&rdquo; "
 "to mean &ldquo;kernel&rdquo;.  Both uses of the term go back many years.  "
@@ -1223,7 +1243,7 @@
 "unixoidan operativni sustav, mi ćemo koristiti termin &ldquo;operativni "
 "sustav na jednak način.&rdquo;"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the time when people speak of the &ldquo;Linux operating "
 "system&rdquo; they are using &ldquo;operating system&rdquo; in the same "
@@ -1240,7 +1260,7 @@
 "točan; no molimo, koristite i termin &ldquo;jezgra&rdquo; kako bi se "
 "izbjegle dvoznačnosti."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
@@ -1251,7 +1271,7 @@
 "distribucija&rdquo; za cijeli zbir programa, to je u redu. Onda bi pričali o 
"
 "sistemskim distribucijama GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The kernel of a system is like the foundation of a house.  How can a house "
 "be almost complete when it doesn't have a foundation? <span class=\"anchor-"
@@ -1261,7 +1281,7 @@
 "nema temelje?<span class=\"anchor-reference-id\">(<a href=\"#house\">#house</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "A kernel is not much like the foundation of a house because building an "
 "operating system is not much like building a house."
@@ -1269,7 +1289,7 @@
 "Ne može se za jezgru reći da je slična temeljima kuće zato jer izgradnja "
 "operativnog sustava nije baš slična gradnji kuće."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A house is built from lots of little general parts that are cut and put "
 "together in situ.  They have to be put together from the bottom up.  Thus, "
@@ -1280,7 +1300,7 @@
 "željenom mjestu. Moraju se sagraditi od temelja prema naviše. Stoga ako "
 "temelj nije izgrađen sve što imate jest rupa u zemlji."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "By contrast, an operating system consists of complex components that can be "
 "developed in any order.  When you have developed most of the components, "
@@ -1296,7 +1316,7 @@
 "važnog modula, bila bi to situacija poput one u kojoj se nalazio sustav GNU "
 "1992."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't the kernel the brain of the system? <span class=\"anchor-reference-id"
 "\">(<a href=\"#brain\">#brain</a>)</span>"
@@ -1304,7 +1324,7 @@
 "Nije li jezgra mozak sustava?<span class=\"anchor-reference-id\">(<a href="
 "\"#brain\">#brain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A computer system is not much like a human body, and no part of it plays a "
 "role comparable to that of the brain in a human."
@@ -1312,7 +1332,7 @@
 "Računalni sustav nije baš sličan ljudskom tijelu, ni jedan dio nema ulogu "
 "koja bi odgovarala ljudskom mozgu."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't writing the kernel most of the work in an operating system? <span "
 "class=\"anchor-reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</"
@@ -1321,11 +1341,11 @@
 "Nije li pisanje jezgre najopsežniji posao u operativnom sustavu?<span class="
 "\"anchor-reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "No, many components take a lot of work."
 msgstr "Ne, mnoge komponente zahtijevaju mnogo truda."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Isn't writing-]{+An operating system requires a kernel.  Since+} the
 # | [-kernel most of-] {+GNU Project didn't develop a kernel, how can+} the
 # | [-work in an operating system? <span-] {+system be GNU?<span+}
@@ -1345,7 +1365,7 @@
 "Nije li pisanje jezgre najopsežniji posao u operativnom sustavu?<span class="
 "\"anchor-reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The people who argue that way for calling the system &ldquo;Linux&rdquo; are "
 "using a double standard.  An operating system requires compilers, editors, "
@@ -1354,34 +1374,34 @@
 "any of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "That standard is too strict, not the right way to judge the contributions of "
 "any contributor."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds made an important contribution to the operating system we "
 "use; the GNU Project started earlier and contributed much more.  The name "
 "&ldquo;GNU/Linux&rdquo; gives credit to each."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How can GNU be an operating system, if I can't get something called &ldquo;"
 "GNU&rdquo; and install it? <span class=\"anchor-reference-id\">(<a href="
 "\"#notinstallable\">#notinstallable</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Many <a href=\"/distros/distros.html\"> packaged and installable versions of "
 "GNU</a> are available.  None of them is called simply &ldquo;GNU&rdquo;, but "
 "GNU is what they basically are."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We expected to release the GNU system packaged for installation, but this "
 "plan was overtaken by events: in 1992 others were already packaging GNU "
@@ -1393,14 +1413,14 @@
 "Hurd kernel&mdash;which wasn't ready yet."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Hurd kernel never became sufficiently ready; we only recommend it to "
 "those interested in working on it.  So we never packaged GNU with the GNU "
 "Hurd kernel.  However, Debian packaged this combination as Debian GNU/Hurd."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are now developing an advanced Scheme-based package manager called Guix "
 "and a complete system distribution based on it called the <a href=\"/"
@@ -1408,14 +1428,14 @@
 "repackaging a substantial part of the GNU system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We never took the last step of packaging GNU under the name &ldquo;"
 "GNU&rdquo;, but that doesn't alter what kind of thing GNU is.  GNU is an "
 "operating system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "We're calling the whole system after the kernel, Linux.  Isn't it normal to "
 "name an operating system after a kernel? <span class=\"anchor-reference-id\">"
@@ -1425,7 +1445,7 @@
 "operativni sustav prema jezgri?<span class=\"anchor-reference-id\">(<a href="
 "\"#afterkernel\">#afterkernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "That practice seems to be very rare&mdash;we can't find any examples other "
 "than the misuse of the name &ldquo;Linux&rdquo;.  Normally an operating "
@@ -1440,7 +1460,7 @@
 "svoje posebno ime, umjesto toga ljudi kažu &ldquo;jezgra toga i ovoga&rdquo; 
"
 "ili &ldquo;takva ili onakva jezgra&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Because those two constructions are used synonymously, the expression &ldquo;"
 "the Linux kernel&rdquo; can easily be misunderstood as meaning &ldquo;the "
@@ -1454,13 +1474,13 @@
 "nesporazuma se izbjegavaju ukoliko se koriste termini &ldquo;jezgra, "
 "Linux&rdquo; ili &ldquo;Linux, jezgra.&rdquo;"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can another system have &ldquo;the feel of Linux&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is no such thing as the &ldquo;feel of Linux&rdquo; because Linux has "
 "no user interfaces.  Like any modern kernel, Linux is a base for running "
@@ -1469,7 +1489,7 @@
 "feel&rdquo; comes from them."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  How about "
 "recommending a shorter name? <span class=\"anchor-reference-id\">(<a href="
@@ -1479,7 +1499,7 @@
 "predložite kraći naziv?<span class=\"anchor-reference-id\">(<a href=\"#long"
 "\">#long</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "For a while we tried the name &ldquo;LiGNUx&rdquo;, which combines the words "
 "&ldquo;GNU&rdquo; and &ldquo;Linux&rdquo;.  The reaction was very bad.  "
@@ -1489,7 +1509,7 @@
 "&ldquo;GNU&rdquo; i &ldquo;Linux&rdquo;. Reakcija ljudi je bila poprilično "
 "loša, naziv &ldquo;GNU/Linux&rdquo; je mnogo bolje prihvaćen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
 "call it &ldquo;GNU/Linux&rdquo; <a href=\"#justgnu\"> for the reasons given "
@@ -1499,14 +1519,14 @@
 "naziv &ldquo;GNU/Linux&rdquo; <a href=\"#justgnu\">zbog dalje navedenih "
 "razloga</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How about calling the system &ldquo;GliNUx&rdquo; (instead of &ldquo;GNU/"
 "Linux&rdquo;)? <span class=\"anchor-reference-id\">(<a href="
 "\"#long1\">#long1</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The name &ldquo;GNU&rdquo; does not visibly appear in &ldquo;Glinux,&rdquo; "
 "so most people would not notice it is there.  Even if it is capitalized as "
@@ -1514,13 +1534,13 @@
 "reference to GNU."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be comparable to writing &ldquo;GNU/Linux,&rdquo; but putting "
 "&ldquo;GNU/&rdquo; in print so small that most people could not read it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  Why should "
 "I go to the trouble of saying &ldquo;GNU/&rdquo;? <span class=\"anchor-"
@@ -1530,7 +1550,7 @@
 "se mučio izgovarajući &ldquo;GNU/&rdquo;?<span 
class=\"anchor-reference-id\">"
 "(<a href=\"#long2\">#long2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
 "the system that we developed, can't you take one second to recognize our "
@@ -1540,21 +1560,21 @@
 "Ako cijenite sistem koji smo razvili, ne možete li odvojiti koju sekundu "
 "kako biste prepoznali naš rad?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Unfortunately, &ldquo;GNU/Linux&rdquo; is five syllables. People won't use "
 "such a long term. Shouldn't you find a shorter one? <span class=\"anchor-"
 "reference-id\">(<a href=\"#long3\">#long3</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, &ldquo;GNU/Linux&rdquo; is only four syllables.  &ldquo;"
 "Unfortunately&rdquo; is five syllables, yet people show no sign of "
 "reluctance to use that word."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  Why
 # | should I go-]{+Stallman doesn't ask us+} to {+call him &ldquo;Richard
 # | Matthew Stallman&rdquo; every+} the [-trouble of saying
@@ -1576,21 +1596,21 @@
 "se mučio izgovarajući &ldquo;GNU/&rdquo;?<span 
class=\"anchor-reference-id\">"
 "(<a href=\"#long2\">#long2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Omitting &ldquo;Matthew&rdquo; does not misrepresent anything important "
 "about Stallman's nature, origin, ideas or purpose.  Omitting &ldquo;"
 "GNU&rdquo; does misrepresent those things about the GNU/Linux system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is an example of a frequent way of hiding a fallacy: to bury it inside "
 "a misleading analogy.  A better analogy would be, &ldquo;Why shouldn't we "
 "call Stallman &lsquo;Torvalds&rsquo;?&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since Linux is a secondary contribution, would it be false to the facts to "
 "call the system simply &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id"
@@ -1600,7 +1620,7 @@
 "sustav samo &ldquo;GNU&rdquo;?<span class=\"anchor-reference-id\">(<a href="
 "\"#justgnu\">#justgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would not be false to the facts, but it is not the best thing to do.  "
 "Here are the reasons we call that system version &ldquo;GNU/Linux&rdquo; "
@@ -1609,7 +1629,7 @@
 "To ne bi bilo netočno ali nije baš najzgodnije. Ovdje ćemo izložiti 
zašto "
 "koristimo naziv &ldquo;GNU/Linux&rdquo; radije nego samo &ldquo;GNU&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It's not exactly GNU&mdash;it has a different kernel (that is, Linux).  "
 "Distinguishing GNU/Linux from GNU is useful."
@@ -1617,7 +1637,7 @@
 "Sustav nije samo GNU&mdash;sadrži drugu jezgru. Razlikovanje GNU/Linuxa od "
 "GNU-a je korisno."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It would be ungentlemanly to ask people to <em>stop</em> giving any credit "
 "to Linus Torvalds.  He did write an important component of the system.  We "
@@ -1636,7 +1656,7 @@
 "ali na častan način i ne želimo mu ukrasti zasluge koje se tiču njegovog "
 "doprinosa sustavu."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
 "&ldquo;GNU&rdquo; they may simply not recognize we're talking about the same "
@@ -1648,7 +1668,7 @@
 "sustavu. Ako kažemo &ldquo;GNU/Linux&rdquo;, ljudi mogu izvesti poveznice s "
 "onime što su čuli."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "I would have to pay a fee if I use &ldquo;Linux&rdquo; in the name of a "
 "product, and that would also apply if I say &ldquo;GNU/Linux&rdquo;.  Is it "
@@ -1662,7 +1682,7 @@
 "izbjegao naknadu?<span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There's nothing wrong in calling the system &ldquo;GNU&rdquo;; basically, "
 "that's what it is.  It is nice to give Linus Torvalds a share of the credit "
@@ -1672,7 +1692,7 @@
 "Lijepo je i priznati zasluge Linusa, međutim, na ovaj način vi nemate "
 "nikakve obveze plaćati tu privilegiju."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "So if you want to refer to the system simply as &ldquo;GNU&rdquo;, to avoid "
 "paying the fee for calling it &ldquo;Linux&rdquo;, we won't criticize you."
@@ -1681,7 +1701,7 @@
 "izbjegavanja plaćanja naknade zbog korištenja naziva &ldquo;Linux&rdquo;, "
 "nećemo vas kritizirati."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today; it includes "
 "TeX, X11, Apache, Perl, and many more programs.  Don't your arguments imply "
@@ -1694,7 +1714,7 @@
 "njima dati priznanje u nazivu? (No to bi dovelo do apsurdno dugačkog 
naziva.)"
 "<span class=\"anchor-reference-id\">(<a href=\"#many\">#many</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "What we say is that you ought to give the system's principal developer a "
 "share of the credit.  The principal developer is the GNU Project, and the "
@@ -1704,7 +1724,7 @@
 "razvijateljima sustava. Glavni razvijatelj je Projekt GNU i sustav je u "
 "osnovi GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you feel even more strongly about giving credit where it is due, you "
 "might feel that some secondary contributors also deserve credit in the "
@@ -1718,7 +1738,7 @@
 "priznati zasluge, slobodno nazovite sustav GNU/X11/Linux. Ako smatrate da "
 "baš treba spomenuti i Perl, slobodno pišite i GNU/Linux/Perl."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Since a long name such as GNU/X11/Apache/Linux/TeX/Perl/Python/FreeCiv "
 "becomes absurd, at some point you will have to set a threshold and omit the "
@@ -1732,7 +1752,7 @@
 "postoji očito mjesto gdje bi granica trebala biti, postavite ju gdje god "
 "želite, bez prigovora"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Different threshold levels would lead to different choices of name for the "
 "system.  But one name that cannot result from concerns of fairness and "
@@ -1744,7 +1764,7 @@
 "jedna granica ne bi smjela uključivati isključivo naziv Linux, a bez naziva 
"
 "GNU, u skladu s poštenjem i pravednosti."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Many companies contributed to-]{+systemd plays an important role in+}
 # | the {+GNU/Linux+} system as it is today; [-doesn't that mean-] {+are+} we
 # | [-ought-] {+obligated+} to call it [-GNU/Red&nbsp;Hat/Novell/Linux?-]
@@ -1766,7 +1786,7 @@
 "nazivati GNU/Red&nbsp;Hat/Novell/Linux? <span class=\"anchor-reference-id\">"
 "(<a href=\"#manycompanies\">#manycompanies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "systemd is a fairly important component, but not as important as the kernel "
 "(Linux), nor as important as the basis of the system as a whole (GNU).  "
@@ -1774,7 +1794,7 @@
 "system &ldquo;GNU/systemd/Linux&rdquo;, there is nothing wrong with doing so."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today, but they don't "
 "insist on calling it XYZ/Linux.  Why should we treat GNU specially? <span "
@@ -1784,7 +1804,7 @@
 "nazivu XYZ/Linux. Zašto bi GNU trebao imati drugačiji tretman?<span class="
 "\"anchor-reference-id\">(<a href=\"#others\">#others</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Thousands of projects have developed programs commonly included in today's "
 "GNU/Linux systems.  They all deserve credit for their contributions, but "
@@ -1796,7 +1816,7 @@
 "doprinos, ali oni nisu glavni razvijatelji sustava kao cjeline i zato ni ne "
 "traže priznanje na takav način."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is different because it is more than just a contributed program, more "
 "than just a collection of contributed programs.  GNU is the framework on "
@@ -1805,7 +1825,7 @@
 "GNU je drugačiji zato jer je on više od programa ili zbira programa. GNU je 
"
 "okvir na temelju kojeg je sustav napravljen."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "GNU is a small fraction of the system nowadays, so why should we mention it? "
 "<span class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</"
@@ -1814,7 +1834,7 @@
 "Danas je GNU samo mali dio sustava, zašto bismo ga trebali spominjati?<span "
 "class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In 2008, we found that GNU packages made up 15% of the &ldquo;main&rdquo; "
 "repository of the gNewSense GNU/Linux distribution.  Linux made up 1.5%.  So "
@@ -1825,7 +1845,7 @@
 "repozitorija distribucije GNU/Linuxa imena gNewSense. Linux je sačinjavao do 
"
 "1.5%. Stoga, ovaj argument bi se više odnosio na naziv &ldquo;Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is a small fraction of the system nowadays, and Linux is an even smaller "
 "fraction.  But they are the system's core; the system was made by combining "
@@ -1835,7 +1855,7 @@
 "Ali oni su temeljni dio sustava, sustav je napravljen njihovom kombinacijom. "
 "Stoga, naziv &ldquo;GNU/Linux&rdquo; je prikladan."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many companies contributed to the system as it is today; doesn't that mean "
 "we ought to call it GNU/Red&nbsp;Hat/Novell/Linux? <span class=\"anchor-"
@@ -1845,7 +1865,7 @@
 "nazivati GNU/Red&nbsp;Hat/Novell/Linux? <span class=\"anchor-reference-id\">"
 "(<a href=\"#manycompanies\">#manycompanies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is not comparable to Red Hat or Novell; it is not a company, or an "
 "organization, or even an activity.  GNU is an operating system.  (When we "
@@ -1858,7 +1878,7 @@
 "to označava projekt koji razvija sustav GNU). Sustav GNU/Linux je baziran na 
"
 "GNU-u i zato se GNU treba nalaziti u nazivu."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Much of those companies' contribution to the GNU/Linux system lies in the "
 "code they have contributed to various GNU packages including GCC and GNOME.  "
@@ -1869,7 +1889,7 @@
 "raznim GNU paketima uključujući GCC i GNOME. Naziv GNU/Linux odaje 
priznanje "
 "tim tvrtkama, kao i ostalim razvijateljima GNU-a."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
@@ -1878,7 +1898,7 @@
 "Zašto pišete &ldquo;GNU/Linux&rdquo; umjesto &ldquo;GNU Linux&rdquo;? <span 
"
 "class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean "
@@ -1891,7 +1911,7 @@
 "&ldquo;Linux&rdquo; koji je paket GNU-a. Nijedan od tih naziva ne odgovara u "
 "trenutnoj situaciji."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is not a GNU package; that is, it wasn't developed under the GNU "
 "Project's aegis or contributed specifically to the GNU Project.  Linus "
@@ -1903,14 +1923,32 @@
 "vlastiti projekt. Tako da &ldquo;Linux, koji je paket GNU-a&rdquo; nije "
 "ispravno značenje."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | We're not talking about a distinct GNU version of Linux, the kernel.  The
+# | free GNU/Linux distros do have a <a
+# | [-href=\"http://directory.fsf.org/project/linux\";>separate-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>separate+} version
+# | of Linux</a>, since the &ldquo;standard&rdquo; version contains
+# | non[---]free firmware &ldquo;blobs&rdquo;.  If this were part of the GNU
+# | Project, it could be considered &ldquo;GNU Linux&rdquo;; but we would not
+# | want to call it that, because it would be too confusing.
+#, fuzzy
+#| msgid ""
+#| "We're not talking about a distinct GNU version of Linux, the kernel.  The "
+#| "free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/";
+#| "project/linux\">separate version of Linux</a>, since the &ldquo;"
+#| "standard&rdquo; version contains non-free firmware &ldquo;blobs&rdquo;.  "
+#| "If this were part of the GNU Project, it could be considered &ldquo;GNU "
+#| "Linux&rdquo;; but we would not want to call it that, because it would be "
+#| "too confusing."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
-"free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/project/";
-"linux\">separate version of Linux</a>, since the &ldquo;standard&rdquo; "
-"version contains non-free firmware &ldquo;blobs&rdquo;.  If this were part "
-"of the GNU Project, it could be considered &ldquo;GNU Linux&rdquo;; but we "
-"would not want to call it that, because it would be too confusing."
+"free GNU/Linux distros do have a <a href=\"https://directory.fsf.org/wiki/";
+"Linux-libre\">separate version of Linux</a>, since the &ldquo;"
+"standard&rdquo; version contains nonfree firmware &ldquo;blobs&rdquo;.  If "
+"this were part of the GNU Project, it could be considered &ldquo;GNU "
+"Linux&rdquo;; but we would not want to call it that, because it would be too "
+"confusing."
 msgstr ""
 "Ovdje ne govorimo o posebnoj GNU-ovoj verziji Linuxa, jezgre. Slobodne "
 "distribucije GNU/Linuxa imaju <a href=\"http://directory.fsf.org/project/";
@@ -1918,7 +1956,7 @@
 "sadrži ne-slobodne tzv. blobove firmvera. Da je ovo dio Projekta GNU, moglo "
 "bi se nazvati GNU Linux ali mi ne želimo takav naziv jer bi bio zbunjujući."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We're talking about a version of GNU, the operating system, distinguished by "
 "having Linux as the kernel.  A slash fits the situation because it means "
@@ -1930,7 +1968,7 @@
 "predstavlja kombinaciju. Sustav je kombinacija GNU-a i Linuxa i stoga &ldquo;"
 "GNU/Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are other ways to express &ldquo;combination&rdquo;.  If you think "
 "that a plus-sign is clearer, please use that.  In French, a hyphen is clear: "
@@ -1942,7 +1980,7 @@
 "&ldquo;GNU-Linux&rdquo;. Na španjolskom jeziku poenekad kažemo &ldquo;GNU "
 "con Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Should we say &ldquo;GNU/BSD&rdquo; too?-]{+How is the name
 # | &ldquo;GNU/Linux&rdquo; pronounced?+} <span
 # | class=\"anchor-reference-id\">(<a [-href=\"#bsd\">#bsd</a>)</span>-]
@@ -1958,14 +1996,14 @@
 "Trebamo li također govoriti &ldquo;GNU/BSD&rdquo;? <span class=\"anchor-"
 "reference-id\">(<a href=\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please pronounce it as &ldquo;GNU slash Linux.&rdquo; If you don't pronounce "
 "the slash, people will think you are saying &ldquo;GNU Linux,&rdquo; which "
 "is <a href=\"#whyslash\">not a suitable name for the combination</a>."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | Why do you write [-&ldquo;GNU/Linux&rdquo; instead of-] &ldquo;GNU
 # | [-Linux&rdquo;?-] {+Emacs&rdquo; rather than &ldquo;GNU/Emacs&rdquo;?+}
 # | <span class=\"anchor-reference-id\">(<a
@@ -1984,7 +2022,7 @@
 "Zašto pišete &ldquo;GNU/Linux&rdquo; umjesto &ldquo;GNU Linux&rdquo;? <span 
"
 "class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 # | Following the rules of English, in the construction &ldquo;GNU
 # | [-Linux&rdquo;-] {+Emacs&rdquo;+} the word &ldquo;GNU&rdquo; modifies
 # | [-&ldquo;Linux&rdquo;.  This can mean either &ldquo;GNU's version of
@@ -2009,14 +2047,14 @@
 "&ldquo;Linux&rdquo; koji je paket GNU-a. Nijedan od tih naziva ne odgovara u "
 "trenutnoj situaciji."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;GNU/Emacs&rdquo; would mean the combination of GNU, the operating "
 "system, and the program Emacs.  That doesn't fit this program, so &ldquo;GNU/"
 "Emacs&rdquo; is the wrong way to refer to it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why &ldquo;GNU/Linux&rdquo; rather than &ldquo;Linux/GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
@@ -2024,7 +2062,7 @@
 "Zašto &ldquo;GNU/Linux&rdquo;, a ne &ldquo;Linux/GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is right and proper to mention the principal contribution first.  The GNU "
 "contribution to the system is not only bigger than Linux and prior to Linux, "
@@ -2034,13 +2072,13 @@
 "sustavu nije samo veći od Linuxa već smo i započeli cijelu tu aktivnost "
 "prije Linuxa."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the lowest "
 "level of the system and GNU fills technically higher levels."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
 "lot better than what people usually do, which is to omit GNU entirely and "
@@ -2050,7 +2088,7 @@
 "bolje od uobičajenih naziva koji ljudi koriste, a to je da izbace GNU u "
 "potpunosti i time se kompletni sustav naizgled čini kao Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
 "say anything about what the system consists of.  Why shouldn't they call it "
@@ -2058,21 +2096,21 @@
 "\"#distronames0\">#distronames0</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling a system &ldquo;Foobar Linux&rdquo; implies that it's a flavor of "
 "&ldquo;Linux,&rdquo; and people <a href=\"#distronames\">understand it that "
 "way</a>."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If they called a GNU/Linux distro &ldquo;Foobar BSD,&rdquo; you would call "
 "that a mistake.  &ldquo;This system is not BSD,&rdquo; you would tell them.  "
 "Well, it's not Linux either."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro is called &ldquo;Foobar Linux&rdquo;; doesn't that show it's "
 "really Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
@@ -2082,7 +2120,7 @@
 "je uistinu Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
 "\">#distronames</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It means that the people who make the &ldquo;Foobar Linux&rdquo; distro are "
 "repeating the common mistake. We appreciate that distributions like Debian, "
@@ -2096,7 +2134,7 @@
 "službenog imena i nadamo se da ćete, ako sudjelujete u razvoju drugih "
 "distribucija, učiniti isto."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's official name is &ldquo;Foobar Linux&rdquo;; isn't it wrong to "
 "call the distro anything but &ldquo;Foobar Linux&rdquo;? <span class="
@@ -2107,7 +2145,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#distronames1\">#distronames1</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 # | [-If it's allowed for them to change-]{+When they spread misinformation by
 # | changing+} &ldquo;GNU&rdquo; to {+&ldquo;Linux&rdquo;, and call their
 # | version of it+} &ldquo;Foobar Linux&rdquo;, it's [-allowed-] {+proper+}
@@ -2132,7 +2170,7 @@
 "distribuciju &ldquo;Foobar GNU/Linux&rdquo;. Ne može ispravljanje postojeće 
"
 "greške  biti veća pogreška od prvotne greške."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be more effective to ask companies such as Mandrake, Red Hat and "
 "IBM to call their distributions &ldquo;GNU/Linux&rdquo; rather than asking "
@@ -2144,7 +2182,7 @@
 "toga od pojedinaca? <span class=\"anchor-reference-id\">(<a href=\"#companies"
 "\">#companies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It isn't a choice of one or the other&mdash;we ask companies and "
 "organizations and individuals to help spread the word about this.  In fact, "
@@ -2162,7 +2200,7 @@
 "komercijalna odluka, očekujemo veću zaradu uz naziv &lsquo;Linux&rsquo;."
 "&rdquo; Drugim riječima, nije ih briga što je ispravno."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We can't make them do this right, but we're not the sort to give up just "
 "because the road isn't easy.  You may not have as much influence at your "
@@ -2175,7 +2213,7 @@
 "Hat ali možete pomoći. Zajedno možemo stvoriti situacije gdje će tvrtkama 
"
 "isplativije biti koristiti naziv &ldquo;GNU/Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to reserve the name &ldquo;GNU/Linux&rdquo; for "
 "distributions that are purely free software? After all, that is the ideal of "
@@ -2187,15 +2225,35 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#reserve\">#reserve</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+# | The widespread practice of adding non[---]free software to the GNU/Linux
+# | system is a major problem for our community.  It teaches the users that
+# | non[---]free software is ok, and that using it is part of the spirit of
+# | &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of
+# | their mission to help users use non[---]free add-ons, and may even invite
+# | salesmen to come and make sales pitches for them.  They adopt goals such
+# | as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them
+# | use non[---]free applications and drivers), or making the system more
+# | popular even at the cost of freedom.
+#, fuzzy
+#| msgid ""
+#| "The widespread practice of adding non-free software to the GNU/Linux "
+#| "system is a major problem for our community.  It teaches the users that "
+#| "non-free software is ok, and that using it is part of the spirit of "
+#| "&ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part "
+#| "of their mission to help users use non-free add-ons, and may even invite "
+#| "salesmen to come and make sales pitches for them.  They adopt goals such "
+#| "as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them "
+#| "use non-free applications and drivers), or making the system more popular "
+#| "even at the cost of freedom."
 msgid ""
-"The widespread practice of adding non-free software to the GNU/Linux system "
-"is a major problem for our community.  It teaches the users that non-free "
+"The widespread practice of adding nonfree software to the GNU/Linux system "
+"is a major problem for our community.  It teaches the users that nonfree "
 "software is ok, and that using it is part of the spirit of &ldquo;"
 "Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of their "
-"mission to help users use non-free add-ons, and may even invite salesmen to "
+"mission to help users use nonfree add-ons, and may even invite salesmen to "
 "come and make sales pitches for them.  They adopt goals such as &ldquo;"
-"helping the users&rdquo; of GNU/Linux (including helping them use non-free "
+"helping the users&rdquo; of GNU/Linux (including helping them use nonfree "
 "applications and drivers), or making the system more popular even at the "
 "cost of freedom."
 msgstr ""
@@ -2208,11 +2266,11 @@
 "(uključivo i pomaganje pri korištenju ne-slobodnog softvera i drajvera), 
ili "
 "popularizacije sustava nauštrb slobode"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The question is how to try to change this."
 msgstr "Postavlja se pitanje kako to promjeniti."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Given that most of the community which uses GNU with Linux already does not "
 "realize that's what it is, for us to disown these adulterated versions, "
@@ -2226,13 +2284,29 @@
 "bi primili željenu poruku. Jedino bi odgovorili da uopće nisu ni smatrali 
da "
 "su ti sustavi GNU"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The way to lead these users to see a connection with freedom is exactly
+# | the opposite: to inform them that all these system versions <em>are</em>
+# | versions of GNU, that they all are based on a system that exists
+# | specifically for the sake of the users' freedom.  With this understanding,
+# | they can start to recognize the distributions that include non[---]free
+# | software as perverted, adulterated versions of GNU, instead of thinking
+# | they are proper and appropriate &ldquo;versions of Linux&rdquo;.
+#, fuzzy
+#| msgid ""
+#| "The way to lead these users to see a connection with freedom is exactly "
+#| "the opposite: to inform them that all these system versions <em>are</em> "
+#| "versions of GNU, that they all are based on a system that exists "
+#| "specifically for the sake of the users' freedom.  With this "
+#| "understanding, they can start to recognize the distributions that include "
+#| "non-free software as perverted, adulterated versions of GNU, instead of "
+#| "thinking they are proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgid ""
 "The way to lead these users to see a connection with freedom is exactly the "
 "opposite: to inform them that all these system versions <em>are</em> "
 "versions of GNU, that they all are based on a system that exists "
 "specifically for the sake of the users' freedom.  With this understanding, "
-"they can start to recognize the distributions that include non-free software "
+"they can start to recognize the distributions that include nonfree software "
 "as perverted, adulterated versions of GNU, instead of thinking they are "
 "proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgstr ""
@@ -2243,7 +2317,7 @@
 "ne-slobodni softver u biti perverzne, iskvarene verzije GNU-a umjesto da "
 "misle da su to uobičajene i ispravne verzije &ldquo;verzije Linuxa&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is very useful to start GNU/Linux User Groups, which call the system GNU/"
 "Linux and adopt the ideals of the GNU Project as a basis for their "
@@ -2260,7 +2334,7 @@
 "te naziva grupe. Korisnici sa površnim pogledom na situaciju imaju pravo na "
 "svoje mišljenje ali ne dajte da vas povuku sa sobom!"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not make a GNU distribution of Linux (sic) and call that GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
@@ -2270,7 +2344,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "All the &ldquo;Linux&rdquo; distributions are actually versions of the GNU "
 "system with Linux as the kernel.  The purpose of the term &ldquo;GNU/"
@@ -2283,7 +2357,7 @@
 "činjenicu. Razviti jednu novu distribuciju i samo nju nazvati &ldquo;GNU/"
 "Linux&rdquo; bi prikrilo našu poantu."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "As for developing a distribution of GNU/Linux, we already did this once, "
 "when we funded the early development of Debian GNU/Linux.  To do it again "
@@ -2297,7 +2371,7 @@
 "imala znatne praktične prednosti nad ostalim distribucijama, ne bi služilo "
 "nikakvoj svrsi"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Instead we help the developers of 100% free GNU/Linux distributions, such as "
 "gNewSense and Ututo."
@@ -2305,7 +2379,7 @@
 "Umjesto toga, pomažemo razvijateljima 100% slobodnih distribucija GNU/"
 "Linuxa, kao Å¡to su gNewSense i Ututo."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not just say &ldquo;Linux is the GNU kernel&rdquo; and release some "
 "existing version of GNU/Linux under the name &ldquo;GNU&rdquo;? <span class="
@@ -2316,7 +2390,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#linuxgnu\">#linuxgnu</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It might have been a good idea to adopt Linux as the GNU kernel back in "
 "1992.  If we had realized, then, how long it would take to get the GNU Hurd "
@@ -2326,7 +2400,7 @@
 "tamo 1992. godine. Da smo onda shvaćali koliko će dugo trebati da GNU Hurd "
 "proradi, možda bismo to i učinili."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we were to take an existing version of GNU/Linux and relabel it as &ldquo;"
 "GNU&rdquo;, that would be somewhat like making a version of the GNU system "
@@ -2337,7 +2411,7 @@
 "to bi bilo nešto slično kao kada bismo napravili verziju GNU sustava i "
 "nazvali je &ldquo;Linux&rdquo;. To nije u redu i ne želimo se tako 
ponašati."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Did the GNU Project condemn and oppose use of Linux in the early days? <span "
 "class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
@@ -2346,7 +2420,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We did not adopt Linux as our kernel, but we didn't condemn or oppose it.  "
 "In 1993 we started discussing the arrangements to sponsor the development of "
@@ -2364,7 +2438,7 @@
 "kombinaciji s Linuxom. Ali izmjene su često bile ad-hoc i neportabilne, "
 "trebalo ih je \"pročistiti\" za instalaciju."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who had made the changes showed little interest in cooperating "
 "with us.  One of them actually told us that he didn't care about working "
@@ -2381,7 +2455,7 @@
 "njihove promjene instaliraju. Međutim, ovi ljudi, koji su razvijali sustav "
 "primarno baziran na GNU-u, su bili prvi koji nisu bili voljni raditi s nama."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It was this experience that first showed us that people were calling a "
 "version of the GNU system &ldquo;Linux&rdquo;, and that this confusion was "
@@ -2394,7 +2468,7 @@
 "molba da nazovete sustav &ldquo;GNU/Linux&rdquo; jest ujedno i naš odgovor "
 "na taj problem i druge probleme uzrokovane krivim imenom."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why did you wait so long before asking people to use the name GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
@@ -2403,7 +2477,7 @@
 "Linux? <span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually we didn't.  We began talking privately with developers and "
 "distributors about this in 1994, and made a more public campaign in 1996.  "
@@ -2413,7 +2487,7 @@
 "distributerima o ovome još 1994. i počeli smo javnu kampanju 1996. godine. "
 "Nastaviti ćemo koliko god je potrebno."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should the GNU/<i>name</i> convention be applied to all programs that are "
 "GPL'ed? <span class=\"anchor-reference-id\">(<a href=\"#allgpled"
@@ -2423,7 +2497,7 @@
 "koji su pod licencom GPL? <span class=\"anchor-reference-id\">(<a href="
 "\"#allgpled\">#allgpled</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We never refer to individual programs as &ldquo;GNU/<i>name</i>&rdquo;.  "
 "When a program is a GNU package, we may call it &ldquo;GNU <i>name</"
@@ -2432,7 +2506,7 @@
 "Individualne programe nikad ne nazivamo &ldquo;GNU/<i>ime</i>&rdquo;. Kad je "
 "program dio paketa GNU, možda ga nazovemo &ldquo;GNU/<i>ime</i>&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU, the operating system, is made up of many different programs.  Some of "
 "the programs in GNU were written as part of the GNU Project or specifically "
@@ -2444,7 +2518,7 @@
 "GNU-ovi paketi, i u njihovim nazivima često koristimo koristimo &ldquo;"
 "GNU&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It's up to the developers of a program to decide if they want to contribute "
 "it and make it a GNU package.  If you have developed a program and you would "
@@ -2457,7 +2531,7 @@
 "paket, molimo vas, pišite nam na <a href=\"mailto:gnu@gnu.org\";>&lt;gnu@gnu."
 "org&gt;</a>, kako bismo ga mogli procijeniti i eventualno prihvatiti."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It wouldn't be fair to put the name GNU on every individual program that is "
 "released under the GPL.  If you write a program and release it under the "
@@ -2477,7 +2551,7 @@
 "pripisati zasluge za to, i dodavanje nazivu &ldquo;GNU&rdquo; ne bi bilo u "
 "redu."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In contrast, we do deserve the overall credit for the GNU operating system "
 "as a whole, even though not for each and every program in it.  The system "
@@ -2489,7 +2563,7 @@
 "kao sastav zbog naše odlučnosti i upornosti koja počinje 1984., mnogo 
prije "
 "nego što je rad na Linuxu započet."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The operating system in which Linux became popular was basically the same as "
 "the GNU operating system.  It was not entirely the same, because it had a "
@@ -2500,7 +2574,7 @@
 "operativnom sustavu GNU. Nije bio u potpunosti isti, imao je drugu jezgru, "
 "no većinom je bio isti sustav - varijanta GNU-a. Bio je sustav GNU/Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux continues to be used primarily in derivatives of that system&mdash;in "
 "today's versions of the GNU/Linux system.  What gives these systems their "
@@ -2511,7 +2585,7 @@
 "današnjim verzijama sustava GNU/Linux. Ono što daje \"osobnost\" tim "
 "sustavima su GNU i Linux u njihovoj biti, a ne sam Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since much of GNU comes from Unix, shouldn't GNU give credit to Unix by "
 "using &ldquo;Unix&rdquo; in its name? <span class=\"anchor-reference-id\">"
@@ -2521,7 +2595,7 @@
 "odati priznanje Unixu koristeći &ldquo;Unix&rdquo; u nazivu? <span class="
 "\"anchor-reference-id\">(<a href=\"#unix\">#unix</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Actually, none of GNU comes from Unix.  Unix was proprietary software (and "
 "still is), so using any of its code in GNU would have been illegal.  This is "
@@ -2538,7 +2612,7 @@
 "zamijenio. Iz Unixa nismo mogli kopirati niti programe niti niti njegove "
 "dijelove, sve je moralo biti pisano iznova."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "No code in GNU comes from Unix, but GNU is a Unix-compatible system; "
 "therefore, many of the ideas and specifications of GNU do come from Unix.  "
@@ -2552,13 +2626,29 @@
 "humorističan način odavanja počasti Unixu, slijedeći hakersku tradiciju "
 "rekurzivnih akronima iz sedamdesetih."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.
+# |  The author of TINT wrote another implementation of TECO (there were
+# | already many of them, for various systems), but instead of calling it by a
+# | dull name like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of
+# | a clever amusing name.  (That's what hacking means: <a
+# | href=\"http{+s+}://stallman.org/articles/on-hacking.html\">playful
+# | cleverness</a>.)
+#, fuzzy
+#| msgid ""
+#| "The first such recursive acronym was TINT, &ldquo;TINT Is Not "
+#| "TECO&rdquo;.  The author of TINT wrote another implementation of TECO "
+#| "(there were already many of them, for various systems), but instead of "
+#| "calling it by a dull name like &ldquo;<em>somethingorother</em> "
+#| "TECO&rdquo;, he thought of a clever amusing name.  (That's what hacking "
+#| "means: <a href=\"http://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
 "The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
 "The author of TINT wrote another implementation of TECO (there were already "
 "many of them, for various systems), but instead of calling it by a dull name "
 "like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of a clever "
-"amusing name.  (That's what hacking means: <a href=\"http://stallman.org/";
+"amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
 "Prvi takav rekurzivni akronim je bio TINT, &ldquo;TINT Is Not TECO&rdquo; "
@@ -2568,7 +2658,7 @@
 "ime. (To hakiranje jest: <a href=\"http://stallman.org/articles/on-hacking.";
 "html\">zaigrana pamet</a>.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Other hackers enjoyed that name so much that we imitated the approach.  It "
 "became a tradition that, when you were writing from scratch a program that "
@@ -2584,7 +2674,7 @@
 "&ldquo;MINK&rdquo; za &ldquo;MINK Is Not Klever&rdquo; (Mink nije Klever). "
 "Koristeći ovaj pristup, nazvali smo naš unixoid &ldquo;GNU's Not 
Unix&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Historically, AT&amp;T which developed Unix did not want anyone to give it "
 "credit by using &ldquo;Unix&rdquo; in the name of a similar system, not even "
@@ -2599,7 +2689,7 @@
 "razloga većina modificiranih verzija Unixa (sve vlasničke, poput Unixa) ima 
"
 "naziv koji uopće ne spominje &ldquo;Unix&rdquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we say &ldquo;GNU/BSD&rdquo; too? <span class=\"anchor-reference-id\">"
 "(<a href=\"#bsd\">#bsd</a>)</span>"
@@ -2607,7 +2697,7 @@
 "Trebamo li također govoriti &ldquo;GNU/BSD&rdquo;? <span class=\"anchor-"
 "reference-id\">(<a href=\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems, "
 "because that term does not fit the history of the BSD systems."
@@ -2615,9 +2705,19 @@
 "Sustave BSD (npr. FreeBSD) ne nazivamo sustavima  &ldquo;GNU/BSD&rdquo; jer "
 "taj naziv ne odgovara povijesti sustava BSD."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The BSD system was developed by UC Berkeley as non[---]free software in
+# | the 80s, and became free in the early 90s.  A free operating system that
+# | exists today is almost certainly either a variant of the GNU system, or a
+# | kind of BSD system.
+#, fuzzy
+#| msgid ""
+#| "The BSD system was developed by UC Berkeley as non-free software in the "
+#| "80s, and became free in the early 90s.  A free operating system that "
+#| "exists today is almost certainly either a variant of the GNU system, or a "
+#| "kind of BSD system."
 msgid ""
-"The BSD system was developed by UC Berkeley as non-free software in the 80s, "
+"The BSD system was developed by UC Berkeley as nonfree software in the 80s, "
 "and became free in the early 90s.  A free operating system that exists today "
 "is almost certainly either a variant of the GNU system, or a kind of BSD "
 "system."
@@ -2627,7 +2727,7 @@
 "operativni sustav koji postoji danas je vrlo vjerojatno inačica ili sustava "
 "GNU ili sustava BSD."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "People sometimes ask whether BSD too is a variant of GNU, as GNU/Linux is.  "
 "It is not.  The BSD developers were inspired to make their code free "
@@ -2640,7 +2740,7 @@
 "oslobađanje koda, a pozivi GNU-ovih aktivista su im pomogli da se odluče to 
"
 "i učiniti; no sam kod ima malo dodirnih točaka s GNU-om."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "BSD systems today use some GNU packages, just as the GNU system and its "
 "variants use some BSD programs; however, taken as wholes, they are two "
@@ -2653,7 +2753,7 @@
 "s različitim nastankom. Razvijatelji BSD-a nisu napisali jezgru i dodali ju "
 "u sustav GNU, stoga naziv GNU/BSD ne odgovara stanju stvari."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The connection between GNU/Linux and GNU is much closer, and that's why the "
 "name &ldquo;GNU/Linux&rdquo; is appropriate for it."
@@ -2661,7 +2761,7 @@
 "Veza između GNU/Linuxa i GNU-a je mnogo čvršća, i zato je naziv 
&ldquo;GNU/"
 "Linux&rdquo; ispravan."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is a version of GNU which uses the kernel from NetBSD.  Its developers "
 "call it &ldquo;Debian GNU/NetBSD&rdquo;, but &ldquo;GNU/"
@@ -2674,7 +2774,7 @@
 "a&rdquo;bi bio ispravniji, jer NetBSD je cjelovit sustav, a ne samo jezgra. "
 "Ovo nije sustav BSD, jer je većina sustava ista kao i sustav GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "If I install the GNU tools on Windows, does that mean I am running a GNU/"
 "Windows system? <span class=\"anchor-reference-id\">(<a href=\"#othersys"
@@ -2684,7 +2784,7 @@
 "Windows? <span class=\"anchor-reference-id\">(<a href=\"#othersys"
 "\">#othersys</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
 "GNU are just a part of the GNU software, which is just a part of the GNU "
@@ -2697,7 +2797,7 @@
 "imali drugi operativni sustav koji nije ni sličan GNU-u. Sve u svemu, ovo je 
"
 "potpuno drugačija situacija od GNU/Linuxa."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can't Linux be used without GNU? <span class=\"anchor-reference-id\">(<a "
 "href=\"#justlinux\">#justlinux</a>)</span>"
@@ -2705,7 +2805,7 @@
 "Ne može li se Linux upotrebljavati bez GNU-a? <span 
class=\"anchor-reference-"
 "id\">(<a href=\"#justlinux\">#justlinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is used by itself, or with small other programs, in some appliances.  "
 "These small software systems are a far cry from the GNU/Linux system.  Users "
@@ -2719,19 +2819,19 @@
 "bi razočarani). Korisno je naglasiti da tu tehniku pokreće sami Linux, kako 
"
 "bi se pokazala razlika između tih malih platformi i GNU/Linuxa."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How much of the GNU system is needed for the system to be GNU/Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "&ldquo;How much&rdquo; is not a meaningful question because the GNU system "
 "does not have precise boundaries."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is an operating system maintained by a community.  It includes far more "
 "than just the GNU software packages (of which we have a specific list), and "
@@ -2741,14 +2841,14 @@
 "much&rdquo; you used."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we look at the level of packages, Linux is one important package in the "
 "GNU/Linux system.  The inclusion of one important GNU package is enough to "
 "justify our request for equal mention."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Are there complete Linux systems [sic] without GNU? <span class=\"anchor-"
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
@@ -2758,7 +2858,7 @@
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 # | There are complete systems that contain Linux and not GNU; Android is an
 # | example.  But it is a mistake to call them &ldquo;Linux&rdquo;
 # | [-systems.-] {+systems, just as it is a mistake to call GNU a
@@ -2775,7 +2875,7 @@
 "Postoje kompletni sustavi koji u sebi imaju samo Linux, a bez GNU-a; Android "
 "je najbolji primjer. No pogrešno je zvati ih sustavima &ldquo;Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 # | Android is very different from the GNU/Linux system&mdash;because [-it
 # | contains-] {+the two have+} very little [-of-] {+code in common.  In
 # | fact,+} the [-GNU system,-] only [-Linux.  Overall, it's a different
@@ -2812,7 +2912,7 @@
 "radi na drugačiji način. Stoga, ono što Android čini drugačijim jest "
 "nedostatak GNU-a."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
 "necessary to say things like, &ldquo;Android contains Linux, but it isn't "
@@ -2820,7 +2920,7 @@
 "[meaning the GNU system].&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android contains just as much of Linux as GNU/Linux does.  What it doesn't "
 "have is the GNU system.  Android replaces that with Google software that "
@@ -2828,7 +2928,7 @@
 "absence of GNU."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Is it correct to say &ldquo;using Linux&rdquo; if it refers to using GNU/"
 "Linux and using Android? <span class=\"anchor-reference-id\">(<a href="
@@ -2836,27 +2936,27 @@
 "\">#usegnulinuxandandroidlinuxsyswithoutgnu</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Far from it.  That usage is so strained that people will not understand the "
 "intended meaning."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public will find it very strange to speak of using Android as &ldquo;"
 "using Linux&rdquo;.  It's like having a conversation, then saying you were "
 "conversing with the person's intestines or the person's circulatory system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public <em>will</em> understand the idea of &ldquo;using Linux&rdquo; "
 "when it's really GNU/Linux, by way of the usual misunderstanding: thinking "
 "of the whole system as &ldquo;Linux&rdquo;."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Use of Android and use of GNU/Linux are totally different, as different as "
 "driving a car and riding a bicycle.  The fact that the first two both "
@@ -2869,7 +2969,7 @@
 "GNU/Linux and Android.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not call the system &ldquo;Linux&rdquo; anyway, and strengthen Linus "
 "Torvalds' role as posterboy for our community? <span class=\"anchor-"
@@ -2879,7 +2979,7 @@
 "kao predstavnika zajednice? <span class=\"anchor-reference-id\">(<a href="
 "\"#helplinus\">#helplinus</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Linus Torvalds is the &ldquo;posterboy&rdquo; (other people's choice of "
 "word, not ours) for his goals, not ours.  His goal is to make the system "
@@ -2896,12 +2996,30 @@
 "philosophy/why-free.html\">slobodu suradnje</a> kao etički princip, i stoga "
 "javnost naziv &ldquo;Linux&rdquo; ne povezuje s tim principom."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | Linus publicly states his disagreement with the free software movement's
+# | ideals.  He developed non[---]free software in his job for many years (and
+# | said so to a large audience at a &ldquo;Linux&rdquo;World show), and
+# | publicly invited fellow developers of Linux, the kernel, to use
+# | non[---]free software to work on it with him.  He goes even further, and
+# | rebukes people who suggest that engineers and scientists should consider
+# | social consequences of our technical work&mdash;rejecting the lessons
+# | society learned from the development of the atom bomb.
+#, fuzzy
+#| msgid ""
+#| "Linus publicly states his disagreement with the free software movement's "
+#| "ideals.  He developed non-free software in his job for many years (and "
+#| "said so to a large audience at a &ldquo;Linux&rdquo;World show), and "
+#| "publicly invited fellow developers of Linux, the kernel, to use non-free "
+#| "software to work on it with him.  He goes even further, and rebukes "
+#| "people who suggest that engineers and scientists should consider social "
+#| "consequences of our technical work&mdash;rejecting the lessons society "
+#| "learned from the development of the atom bomb."
 msgid ""
 "Linus publicly states his disagreement with the free software movement's "
-"ideals.  He developed non-free software in his job for many years (and said "
+"ideals.  He developed nonfree software in his job for many years (and said "
 "so to a large audience at a &ldquo;Linux&rdquo;World show), and publicly "
-"invited fellow developers of Linux, the kernel, to use non-free software to "
+"invited fellow developers of Linux, the kernel, to use nonfree software to "
 "work on it with him.  He goes even further, and rebukes people who suggest "
 "that engineers and scientists should consider social consequences of our "
 "technical work&mdash;rejecting the lessons society learned from the "
@@ -2916,7 +3034,7 @@
 "napretka&mdash;odbacujući lekcije koje je društvo naučilo pri razvoju "
 "atomske bombe."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with writing a free program for the motivations of "
 "learning and having fun; the kernel Linus wrote for those reasons was an "
@@ -2935,7 +3053,7 @@
 "svjesni da ovaj operativni sustav potječe iz ideala slobode, a ne iz "
 "Linusovih pogleda."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong for us to label Linus Torvalds' work as GNU? <span class="
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
@@ -2943,7 +3061,7 @@
 "Nije li pogrešno označavati djelo Linusa Torvaldsa kao GNU? <span class="
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong, so we don't do that.  Torvalds' work is Linux, the "
 "kernel; we are careful not to attribute that work to the GNU Project or "
@@ -2955,7 +3073,7 @@
 "&ldquo;GNU&rdquo;. Kada pričamo o kompletnom sustavu, naziv &ldquo;GNU/"
 "Linux&rdquo; mu daje priznanje za njegov rad."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Does Linus Torvalds agree that Linux is just the kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
@@ -2963,10 +3081,23 @@
 "Slaže li se Linus Torvalds u označavanju Linuxa samo kao jezgre? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | He recognized this at the beginning.  The earliest Linux release notes
+# | said, <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | &ldquo;Most of the tools used with linux are GNU software and are under
+# | the GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
+# |  for more info&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
+#| "versions/RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are "
+#| "GNU software and are under the GNU copyleft. These tools aren't in the "
+#| "distribution - ask me (or GNU)  for more info&rdquo;</a>."
 msgid ""
 "He recognized this at the beginning.  The earliest Linux release notes said, "
-"<a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"<a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
 "RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are GNU software "
 "and are under the GNU copyleft. These tools aren't in the distribution - ask "
 "me (or GNU)  for more info&rdquo;</a>."
@@ -2977,29 +3108,29 @@
 "i pod licencom su GNU copyleft. Ovi alati nisu u distribuciji - pitajte mene "
 "(ili GNU) za više informacija.&rdquo;</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not finish the GNU Hurd kernel, release the GNU system as a whole, and "
 "forget the question of what to call GNU/Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#finishhurd\">#finishhurd</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We would like credit for the GNU operating system no matter which kernel is "
 "used with it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Making the GNU Hurd work well enough to compete with Linux would be a big "
 "job, and it's not clearly necessary.  The only thing ethically wrong with "
 "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the best "
-"fix for that problem is <a href=\"http://fsf.org/campaigns/priority-projects";
-"\"> developing free replacement for the blobs</a>."
+"fix for that problem is <a href=\"https://www.fsf.org/campaigns/priority-";
+"projects\"> developing free replacement for the blobs</a>."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The battle is already lost&mdash;society has made its decision and we can't "
 "change it, so why even think about it? <span class=\"anchor-reference-id\">"
@@ -3009,7 +3140,7 @@
 "promijeniti, čemu uopće razmišljati o tome? <span 
class=\"anchor-reference-id"
 "\">(<a href=\"#lost\">#lost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This isn't a battle, it is a campaign of education.  What to call the system "
 "is not a single decision, to be made at one moment by &ldquo;society&rdquo;: "
@@ -3024,7 +3155,7 @@
 "prisiliti druge da sustav nazivaju &ldquo;GNU/Linux&rdquo;, ali vi sami "
 "možete odlučiti tako ga zvati, i čineći tako, pomažete u educiranju 
drugih."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Society has made its decision and we can't change it, so what good does it "
 "do if I say &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id\">(<a "
@@ -3034,7 +3165,7 @@
 "ja kažem &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id\">(<a "
 "href=\"#whatgood\">#whatgood</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is not an all-or-nothing situation: correct and incorrect pictures are "
 "being spread more or less by various people.  If you call the system &ldquo;"
@@ -3053,7 +3184,7 @@
 "Linux&rdquo;, educirat ćete poveći broj ljudi uz malo truda. A neki od njih 
"
 "će proslijediti točnu informaciju drugima."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to call the system &ldquo;Linux&rdquo; and teach "
 "people its real origin with a ten-minute explanation? <span class=\"anchor-"
@@ -3063,7 +3194,7 @@
 "minuta objasniti ljudima njegovo porijeklo? <span class=\"anchor-reference-id"
 "\">(<a href=\"#explain\">#explain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "If you help us by explaining to others in that way, we appreciate your "
 "effort, but that is not the best method.  It is not as effective as calling "
@@ -3073,7 +3204,7 @@
 "no to nije najbolja metoda. Nije efektna poput korištenja naziva &ldquo;GNU/"
 "Linux&rdquo;, i neefikasno koristi vaše vrijeme."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is ineffective because it may not sink in, and surely will not "
 "propagate.  Some of the people who hear your explanation will pay attention, "
@@ -3089,7 +3220,7 @@
 "nazvati &ldquo;Linuxom&rdquo;. Nehtijući, pomoći će pri širenju netočnih 
"
 "informacija."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is inefficient because it takes a lot more time.  Saying and writing "
 "&ldquo;GNU/Linux&rdquo; will take you only a few seconds a day, not minutes, "
@@ -3102,7 +3233,7 @@
 "većeg broja ljudi. Razlikovanje Linuxa i GNU/Linuxa u govoru i u pismu je "
 "najjednostavniji način efektnog pomaganja Projektu GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people laugh at you when you ask them to call the system GNU/Linux.  "
 "Why do you subject yourself to this treatment? <span class=\"anchor-"
@@ -3112,7 +3243,7 @@
 "Zašto se sami podvrgavate ismijavanju? <span class=\"anchor-reference-id\">"
 "(<a href=\"#treatment\">#treatment</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; tends to give people a mistaken "
 "picture of the system's history and reason for existence.  People who laugh "
@@ -3126,7 +3257,7 @@
 "naš posao, te se smiju kada tražimo da se prizna naš rad. Da znaju istinu, 
"
 "vjerojatno se ne bi smijali."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Why do we take the risk of making a request that sometimes leads people to "
 "ridicule us? Because often it has useful results that help the GNU Project.  "
@@ -3136,7 +3267,7 @@
 "rezultat dobijemo pomoć Projektu GNU. Riskirat ćemo i dalje to nezasluženo 
"
 "zlostavljanje kako bismo ostvarili naše ciljeve."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you see such an ironically unfair situation occurring, please don't sit "
 "idly by.  Please teach the laughing people the real history.  When they see "
@@ -3146,7 +3277,7 @@
 "Molimo, poučite ljude istini. Kada ljudi shvate zašto je taj zahtjev "
 "opravdan, oni s malo razuma će se prestati ismijavati."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people condemn you when you ask them to call the system GNU/Linux.  "
 "Don't you lose by alienating them? <span class=\"anchor-reference-id\">(<a "
@@ -3156,7 +3287,7 @@
 "li njihovim otuđivanjem? <span class=\"anchor-reference-id\">(<a href="
 "\"#alienate\">#alienate</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not much.  People who don't appreciate our role in developing the system are "
 "unlikely to make substantial efforts to help us.  If they do work that "
@@ -3171,7 +3302,7 @@
 "razloga, a ne jer smo ih zatražili. Usto, učeći druge da pripisuju naš 
rad "
 "drugima, potkopavaju našu mogućnost pridobivanja pomoći od drugih."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It makes no sense to worry about alienating people who are already mostly "
 "uncooperative, and it is self-defeating to be deterred from correcting a "
@@ -3183,7 +3314,7 @@
 "produbljuju taj problem vodi u predaju. Stoga, nastavit ćemo s pokušajima "
 "ispravka ovog pogrešnog naziva."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Whatever you contributed, is it legitimate to rename the operating system? "
 "<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
@@ -3191,7 +3322,7 @@
 "Bez obzira na vaš doprinos, je li legitimno preimenovati operativni sustav? "
 "<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are not renaming anything; we have been calling this system &ldquo;"
 "GNU&rdquo; ever since we announced it in 1983.  The people who tried to "
@@ -3201,7 +3332,7 @@
 "najavili. Ljudi koji su ga pokušali preimenovati u  &ldquo;Linux&rdquo; su u 
"
 "krivu i nisu to trebali napraviti."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong to force people to call the system &ldquo;GNU/Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
@@ -3209,7 +3340,7 @@
 "Nije li pogrešno prisiljavati ljude da sustav zovu &ldquo;GNU/Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong to force them, and we don't try.  We call the system "
 "&ldquo;GNU/Linux&rdquo;, and we ask you to do it too."
@@ -3217,7 +3348,7 @@
 "Bilo bi pogrešno prisiljavati ih, stoga to ni ne pokušavamo. Mi sustav "
 "zovemo &ldquo;GNU/Linux&rdquo; i tražimo od vas da učinite isto."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not sue people who call the whole system &ldquo;Linux&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
@@ -3225,7 +3356,7 @@
 "Zašto ne tužite ljude koji cijeli sustav zovu &ldquo;Linux&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are no legal grounds to sue them, but since we believe in freedom of "
 "speech, we wouldn't want to do that anyway.  We ask people to call the "
@@ -3235,7 +3366,7 @@
 "htjeli napraviti. Tražimo od ljudi da sustav zovu &ldquo;GNU/Linux&rdquo; "
 "zato jer je to ispravno."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Shouldn't you put something in the GNU GPL to require people to call the "
 "system &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id\">(<a href="
@@ -3245,13 +3376,31 @@
 "zvati sustav &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id\">(<a href="
 "\"#require\">#require</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
+# | The purpose of the GNU GPL is to protect the users' freedom from those who
+# | would make proprietary versions of free software.  While it is true that
+# | those who call the system &ldquo;Linux&rdquo; often do things that limit
+# | the users' freedom, such as bundling non[---]free software with the
+# | GNU/Linux system or even developing non[---]free software for such use,
+# | the mere act of calling the system &ldquo;Linux&rdquo; does not, in
+# | itself, deny users their freedom.  It seems improper to make the GPL
+# | restrict what name people can use for the system.
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU GPL is to protect the users' freedom from those "
+#| "who would make proprietary versions of free software.  While it is true "
+#| "that those who call the system &ldquo;Linux&rdquo; often do things that "
+#| "limit the users' freedom, such as bundling non-free software with the GNU/"
+#| "Linux system or even developing non-free software for such use, the mere "
+#| "act of calling the system &ldquo;Linux&rdquo; does not, in itself, deny "
+#| "users their freedom.  It seems improper to make the GPL restrict what "
+#| "name people can use for the system."
 msgid ""
 "The purpose of the GNU GPL is to protect the users' freedom from those who "
 "would make proprietary versions of free software.  While it is true that "
 "those who call the system &ldquo;Linux&rdquo; often do things that limit the "
-"users' freedom, such as bundling non-free software with the GNU/Linux system "
-"or even developing non-free software for such use, the mere act of calling "
+"users' freedom, such as bundling nonfree software with the GNU/Linux system "
+"or even developing nonfree software for such use, the mere act of calling "
 "the system &ldquo;Linux&rdquo; does not, in itself, deny users their "
 "freedom.  It seems improper to make the GPL restrict what name people can "
 "use for the system."
@@ -3265,7 +3414,7 @@
 "slobode. Bilo bi neispravno ograničavati GPL-om naziv koji ljudi smiju "
 "koristiti za svoj sustav."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you objected to the original BSD license's advertising requirement to "
 "give credit to the University of California, isn't it hypocritical to demand "
@@ -3277,7 +3426,7 @@
 "priznanje za Projekt GNU? <span class=\"anchor-reference-id\">(<a href="
 "\"#BSDlicense\">#BSDlicense</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would be hypocritical to make the name GNU/Linux a license requirement, "
 "and we don't.  We only <em>ask</em> you to give us the credit we deserve."
@@ -3285,7 +3434,7 @@
 "Bilo bi licemjerno da je naziv GNU/Linux dio licence, stoga to ni ne činimo. 
"
 "Mi samo tražimo da nam odate priznanje koje zaslužujemo."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please note that there are at least <a href=\"/licenses/bsd.html\"> two "
 "different BSD licenses</a>.  For clarity's sake, please don't use the term "
@@ -3295,7 +3444,7 @@
 "licence BSD</a>. Zbog jasnoće, molimo da ne koristite termin &ldquo;licenca "
 "BSD&rdquo; a da ne naznačite o kojoj se radi."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you failed to put something in the GNU GPL to require people to call "
 "the system &ldquo;GNU&rdquo;, you deserve what happened; why are you "
@@ -3307,7 +3456,7 @@
 "zašto se sada žalite?<span class=\"anchor-reference-id\">(<a 
href=\"#deserve"
 "\">#deserve</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The question presupposes a rather controversial general ethical premise: "
 "that if people do not force you to treat them fairly, you are entitled to "
@@ -3318,11 +3467,11 @@
 "netko ne natjera da ga tretirate pošteno, imate pravo iskorištavati ga po "
 "vlastitoj želji i volji. Drugim riječima, pretpostavlja da snaga caruje."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope you disagree with that premise just as we do."
 msgstr "Nadamo se da dijelite naše neslaganje s ovom premisom."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't you be better off not contradicting what so many people believe? "
 "<span class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)"
@@ -3332,7 +3481,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't think we should go along with large numbers of people because they "
 "have been misled.  We hope you too will decide that truth is important."
@@ -3340,7 +3489,7 @@
 "Ne smatramo da trebamo slijediti većinu koja je zavarana. Nadamo se da ćete 
"
 "i vi shvatiti kako je istina važna."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We could never have developed a free operating system without first denying "
 "the belief, held by most people, that proprietary software was legitimate "
@@ -3350,7 +3499,7 @@
 "prvo odbacili većinsko vjerovanje kako je vlasnički softver legitiman i "
 "prihvatljiv."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
 "<span class=\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</"
@@ -3360,18 +3509,18 @@
 "ispravnim?<span class=\"anchor-reference-id\">(<a href=\"#somanyright"
 "\">#somanyright</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "We don't think that the popularity of an error makes it the truth."
 msgstr "Ne smatramo da popularnost grešku čini istinom."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it better to call the system by the name most users already know? "
 "<span class=\"anchor-reference-id\">(<a href=\"#knownname\">#knownname</a>)</"
 "span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo; includes "
 "&ldquo;Linux&rdquo;, they will recognize what you're talking about.  If you "
@@ -3379,7 +3528,7 @@
 "once in a while, they will all understand."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many people care about what's convenient or who's winning, not about "
 "arguments of right or wrong.  Couldn't you get more of their support by a "
@@ -3391,12 +3540,12 @@
 "drugačiji način?<span class=\"anchor-reference-id\">(<a href=\"#winning"
 "\">#winning</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 # | To care only about what's convenient or who's winning is an amoral
-# | approach to life.  Non-free software is an example of that amoral approach
-# | and thrives on it.  [-So-]  {+Thus,+} in the long run it [-is-] {+would
-# | be+} self-defeating for us to [-bow to-] {+adopt+} that approach.  We will
-# | continue talking in terms of right and wrong.
+# | approach to life.  Non[---]free software is an example of that amoral
+# | approach and thrives on it.  [-So-]  {+Thus,+} in the long run it [-is-]
+# | {+would be+} self-defeating for us to [-bow to-] {+adopt+} that approach. 
+# | We will continue talking in terms of right and wrong.
 #, fuzzy
 #| msgid ""
 #| "To care only about what's convenient or who's winning is an amoral "
@@ -3406,16 +3555,16 @@
 #| "and wrong."
 msgid ""
 "To care only about what's convenient or who's winning is an amoral approach "
-"to life.  Non-free software is an example of that amoral approach and "
-"thrives on it.  Thus, in the long run it would be self-defeating for us to "
-"adopt that approach.  We will continue talking in terms of right and wrong."
+"to life.  Nonfree software is an example of that amoral approach and thrives "
+"on it.  Thus, in the long run it would be self-defeating for us to adopt "
+"that approach.  We will continue talking in terms of right and wrong."
 msgstr ""
 "Mariti samo za ono što je prikladno ili tko pobjeđuje jest nemoralan 
pristup "
 "životu. Ne-slobodan softver je primjer tog nemoralnog pristupa i buja na "
 "njemu. Dugoročno gledano, pokloniti se tom pristupu bilo bi pristati na "
 "poraz. Nastavit ćemo pričati o pravom i krivom."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope that you are one of those for whom right and wrong do matter."
 msgstr "Nadamo se da ste i vi jedni od onih kojima su dobro i zlo važni."
 
@@ -3470,18 +3619,14 @@
 "prijevode</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2001, [-2006, 2007, 2008,-] {+2006-2008,+} 2010, 2011,
-# | [-2013-] {+2013, 2014-2018, 2020, 2021+} Free Software Foundation, Inc.
+# | Copyright &copy; [-2010, 2013-] {+2001-2011, 2013-2018, 2020, 2021+} Free
+# | Software Foundation, Inc.
 #, fuzzy
-#| msgid ""
-#| "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013 Free Software "
-#| "Foundation, Inc."
+#| msgid "Copyright &copy; 2010, 2013 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013 Free Software "
-"Foundation, Inc."
+"Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation, "
+"Inc."
+msgstr "Copyright &copy; 2010, 2013 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -3503,6 +3648,17 @@
 msgid "Updated:"
 msgstr "Zadnji put promijenjeno:"
 
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013 Free Software "
+#~| "Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
+#~ "Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013 Free Software "
+#~ "Foundation, Inc."
+
 #~ msgid "GNU/Linux FAQ by Richard Stallman"
 #~ msgstr "ČPP o GNU/Linuxu, napisao Richard Stallman"
 

Index: gnu/po/gnu-linux-faq.it-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.it-diff.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gnu/po/gnu-linux-faq.it-diff.html   30 Apr 2021 06:36:13 -0000      1.7
+++ gnu/po/gnu-linux-faq.it-diff.html   30 Aug 2021 13:34:53 -0000      1.8
@@ -10,35 +10,34 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.86</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.86</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;GNU/Linux FAQ
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/gnu/po/gnu-linux-faq.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;GNU/Linux FAQ 
by</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;GNU/Linux FAQ&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;GNU/Linux <span class="removed"><del><strong>FAQ 
by</strong></del></span> <span class="inserted"><ins><em>FAQ&lt;/h2&gt;
 
-&lt;address class="byline c"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;</strong></del></span> <span 
class="inserted"><ins><em>Stallman&lt;/address&gt;
+&lt;address class="byline"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;
 
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;To</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;To</em></ins></span> learn more about 
this issue, you can also read
+  &lt;blockquote&gt;&lt;p&gt;To learn more about this issue, you can also read
 our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
Project&lt;/a&gt;, our
  page on &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;
 and our page on &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU
-Users Who Have Never Heard of <span 
class="removed"><del><strong>GNU&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;</strong></del></span>
 <span class="inserted"><ins><em>GNU&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
-&lt;/div&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;
+Users Who Have Never Heard of GNU&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span> <span 
class="inserted"><ins><em>Stallman&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;
 When people see that we use and recommend the name GNU/Linux for a
 system that many others call just &ldquo;Linux&rdquo;, they ask many questions.
 Here are common questions, and our answers.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;div class="toc"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;h3 class="no-display"&gt;Table of Contents&lt;/h3&gt;</em></ins></span>
 &lt;ul&gt;
 
 &lt;li&gt;&lt;a href="#why"&gt;Why do you call the system we use GNU/Linux and 
not Linux?&lt;/a&gt;&lt;/li&gt;
@@ -299,7 +298,16 @@
     get more of their support by a different road?&lt;/a&gt;&lt;/li&gt;
 
 &lt;/ul&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;/div&gt;
+
+&lt;div class="announcement comment" role="complementary"&gt;
+&lt;p&gt;To learn more about this issue, you can also read
+our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
System&lt;/a&gt;, our
+ page on &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;
+and our page on &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU
+Users Who Have Never Heard of GNU&lt;/a&gt;.&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;</em></ins></span>
 
 &lt;dl&gt;
 
@@ -340,10 +348,16 @@
 
 &lt;dt id="what"&gt;What is the real relationship between GNU and Linux? 
&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#what"&gt;#what&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
-&lt;dd&gt;The GNU operating system and the Linux kernel are separate
+<span class="removed"><del><strong>&lt;dd&gt;The</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;dd&gt;
+&lt;p&gt;
+The</em></ins></span> GNU operating system and the Linux kernel are separate
 software projects that do complementary jobs.  Typically they are
 packaged in a &lt;a href="/distros/distros.html"&gt;GNU/Linux 
distribution&lt;/a&gt;, and used
-together.&lt;/dd&gt;
+<span class="removed"><del><strong>together.&lt;/dd&gt;</strong></del></span>
+<span class="inserted"><ins><em>together.&lt;/p&gt;
+&lt;/dd&gt;</em></ins></span>
 
 &lt;dt id="howerror"&gt;How did it come about that most
     people call the system &ldquo;Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#howerror"&gt;#howerror&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
@@ -456,11 +470,12 @@
           support an individual's free speech rights to call the system by
           any name that individual chooses? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#freespeech"&gt;#freespeech&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Yes, indeed, we believe you have a free speech right to call the
 operating system by any name you wish.  We ask that people call it
 GNU/Linux as a matter of doing justice to the GNU project, to promote
 the values of freedom that GNU stands for, and to inform others that
-those values of freedom brought the system into existence.
+those values of freedom brought the system into <span 
class="removed"><del><strong>existence.</strong></del></span> <span 
class="inserted"><ins><em>existence.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="everyoneknows"&gt;Since everyone knows the role
@@ -490,11 +505,12 @@
     why does it matter what name I use? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#everyoneknows2"&gt;#everyoneknows2&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 If your words don't reflect your knowledge, you don't teach others.
 Most people who have heard of the GNU/Linux system think it is
 &ldquo;Linux&rdquo;, that it was started by Linus Torvalds, and that
 it was intended to be &ldquo;open source&rdquo;.  If you don't tell
-them, who will?
+them, who <span class="removed"><del><strong>will?</strong></del></span> <span 
class="inserted"><ins><em>will?&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="windows"&gt;Isn't shortening &ldquo;GNU/Linux&rdquo;
@@ -601,19 +617,21 @@
 &lt;dt id="brain"&gt;Isn't the kernel the brain of the system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#brain"&gt;#brain&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 A computer system is not much like a human body,
 and no part of it plays a role comparable to that of
-the brain in a human.
+the brain in a <span class="removed"><del><strong>human.</strong></del></span> 
<span class="inserted"><ins><em>human.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="kernelmost"&gt;Isn't writing the kernel most of the work in an
 operating system? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#kernelmost"&gt;#kernelmost&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-No, many components take a lot of work.
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
+No, many components take a lot of <span 
class="removed"><del><strong>work.</strong></del></span> <span 
class="inserted"><ins><em>work.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="nokernel"&gt;An operating system 
requires a kernel.
+&lt;dt id="nokernel"&gt;An operating system requires a kernel.
     Since the GNU Project didn't develop a kernel, how can
     the system be GNU?&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#nokernel"&gt;#nokernel&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -632,10 +650,10 @@
 &lt;p&gt;
 Linus Torvalds made an important contribution to the operating system
 we use; the GNU Project started earlier and contributed much more.
-The name &ldquo;GNU/Linux&rdquo; gives credit to each.&lt;/p&gt;
+The name &ldquo;GNU/Linux&rdquo; gives credit to 
each.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="notinstallable"&gt;How can GNU be an
+&lt;dt id="notinstallable"&gt;How can GNU be an
     operating system, if I can't get something called &ldquo;GNU&rdquo;
     and install it? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#notinstallable"&gt;#notinstallable&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -696,11 +714,12 @@
     feel of Linux&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#feel"&gt;#feel&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 There is no such thing as the &ldquo;feel of Linux&rdquo; because
 Linux has no user interfaces.  Like any modern kernel, Linux is a base
 for running programs; user interfaces belong elsewhere in the system.
 Human interaction with GNU/Linux always goes through other programs,
-and the &ldquo;feel&rdquo; comes from them.
+and the &ldquo;feel&rdquo; comes from <span 
class="removed"><del><strong>them.</strong></del></span> <span 
class="inserted"><ins><em>them.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="long"&gt;The problem with &ldquo;GNU/Linux&rdquo; is that it is too 
long.
@@ -791,7 +810,8 @@
 may simply not recognize we're talking about the same system.  If we
 say &ldquo;GNU/Linux&rdquo;, they can make a connection to what they have heard
 about.&lt;/li&gt;
-&lt;/ul&gt;&lt;p&gt;&lt;/p&gt;
+<span 
class="removed"><del><strong>&lt;/ul&gt;&lt;p&gt;&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/ul&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="trademarkfee"&gt;I would have
@@ -845,11 +865,12 @@
     GNU/systemd/Linux? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#others"&gt;#others&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+&lt;p&gt;
 systemd is a fairly important component, but not as important as the
 kernel (Linux), nor as important as the basis of the system as a whole
 (GNU).  However, if you want to emphasize the presence of systemd
 by calling the system &ldquo;GNU/systemd/Linux&rdquo;, there is nothing
-wrong with doing so.
+wrong with doing so.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt</em></ins></span> id="others"&gt;Many other projects contributed to
@@ -921,8 +942,8 @@
 &lt;p&gt;
 We're not talking about a distinct GNU version of Linux, the kernel.
 The free GNU/Linux distros do have
-a &lt;a href="http://directory.fsf.org/project/linux"&gt;separate version of
-Linux&lt;/a&gt;, since the &ldquo;standard&rdquo; version contains non-free
+a &lt;a <span 
class="removed"><del><strong>href="http://directory.fsf.org/project/linux"&gt;separate</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://directory.fsf.org/wiki/Linux-libre"&gt;separate</em></ins></span>
 version of
+Linux&lt;/a&gt;, since the &ldquo;standard&rdquo; version contains <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
 firmware &ldquo;blobs&rdquo;.  If this were part of the GNU Project,
 it could be considered &ldquo;GNU Linux&rdquo;; but we would not want
 to call it that, because it would be too confusing.&lt;/p&gt;
@@ -1042,13 +1063,13 @@
     free software?  After all, that is the ideal of GNU. &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#reserve"&gt;#reserve&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-The widespread practice of adding non-free software to the GNU/Linux
+The widespread practice of adding <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software to the GNU/Linux
 system is a major problem for our community.  It teaches the users
-that non-free software is ok, and that using it is part of the spirit
+that <span class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software is ok, and that 
using it is part of the spirit
 of &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of 
their mission to
-help users use non-free add-ons, and may even invite salesmen to come
+help users use <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> add-ons, and may even 
invite salesmen to come
 and make sales pitches for them.  They adopt goals such as &ldquo;helping
-the users&rdquo; of GNU/Linux (including helping them use non-free
+the users&rdquo; of GNU/Linux (including helping them use <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
 applications and drivers), or making the system more popular even at
 the cost of freedom.
 &lt;p&gt;
@@ -1066,7 +1087,7 @@
 versions &lt;em&gt;are&lt;/em&gt; versions of GNU, that they all are based on a
 system that exists specifically for the sake of the users' freedom.
 With this understanding, they can start to recognize the distributions
-that include non-free software as perverted, adulterated versions of
+that include <span class="removed"><del><strong>non-free</strong></del></span> 
<span class="inserted"><ins><em>nonfree</em></ins></span> software as 
perverted, adulterated versions of
 GNU, instead of thinking they are proper and appropriate &ldquo;versions of
 Linux&rdquo;.&lt;/p&gt;
 &lt;p&gt;
@@ -1219,7 +1240,7 @@
 (there were already many of them, for various systems), but instead of
 calling it by a dull name like &ldquo;&lt;em&gt;somethingorother&lt;/em&gt; 
TECO&rdquo;, he
 thought of a clever amusing name.  (That's what hacking
-means: &lt;a href="http://stallman.org/articles/on-hacking.html"&gt;playful
+means: &lt;a <span 
class="removed"><del><strong>href="http://stallman.org/articles/on-hacking.html"&gt;playful</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://stallman.org/articles/on-hacking.html"&gt;playful</em></ins></span>
 cleverness&lt;/a&gt;.)&lt;/p&gt;
 &lt;p&gt;
 Other hackers enjoyed that name so much that we imitated the approach.
@@ -1245,7 +1266,7 @@
 We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems,
 because that term does not fit the history of the BSD systems.
 &lt;p&gt;
-The BSD system was developed by UC Berkeley as non-free software in
+The BSD system was developed by UC Berkeley as <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software in
 the 80s, and became free in the early 90s.  A free operating system
 that exists today is almost certainly either a variant of the GNU
 system, or a kind of BSD system.&lt;/p&gt;
@@ -1276,22 +1297,24 @@
 on Windows, does that mean I am running a GNU/Windows system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#othersys"&gt;#othersys&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of 
GNU
 are just a part of the GNU software, which is just a part of the GNU
 system, and underneath them you would still have another complete
 operating system which has no code in common with GNU.  All in all,
-that's a very different situation from GNU/Linux.
+that's a very different situation from <span 
class="removed"><del><strong>GNU/Linux.</strong></del></span> <span 
class="inserted"><ins><em>GNU/Linux.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="justlinux"&gt;Can't Linux be used without GNU? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#justlinux"&gt;#justlinux&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Linux is used by itself, or with small other programs, in some
 appliances.  These small software systems are a far cry from the
 GNU/Linux system.  Users do not install them on PCs, for instance, and
 would find them rather disappointing.  It is useful to say that these
 appliances run just Linux, to show how different those small platforms
-are from GNU/Linux.
+are from <span class="removed"><del><strong>GNU/Linux.</strong></del></span> 
<span class="inserted"><ins><em>GNU/Linux.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="howmuch"&gt;How much of the GNU system is needed for the system
@@ -1381,10 +1404,11 @@
 &ldquo;Linux&rdquo; with that principle.
 &lt;p&gt;
 Linus publicly states his disagreement with the free software
-movement's ideals.  He developed non-free software in his job for many
+movement's ideals.  He developed <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software in his job for many
 years (and said so to a large audience at a &ldquo;Linux&rdquo;World show), and
 publicly invited fellow developers of Linux, the kernel, to use
-non-free software to work on it with him.  He goes even further, and
+<span class="removed"><del><strong>non-free</strong></del></span>
+<span class="inserted"><ins><em>nonfree</em></ins></span> software to work on 
it with him.  He goes even further, and
 rebukes people who suggest that engineers and scientists should
 consider social consequences of our technical work&mdash;rejecting the
 lessons society learned from the development of the atom bomb.&lt;/p&gt;
@@ -1403,11 +1427,13 @@
     work as GNU? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#claimlinux"&gt;#claimlinux&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 It would be wrong, so we don't do that.  Torvalds' work is Linux, the
 kernel; we are careful not to attribute that work to the GNU Project
 or label it as &ldquo;GNU&rdquo;.  When we talk about the whole
 system, the name &ldquo;GNU/Linux&rdquo; gives him a share of the
-credit.
+<span class="removed"><del><strong>credit.</strong></del></span>
+<span class="inserted"><ins><em>credit.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 
@@ -1417,7 +1443,8 @@
 &lt;dd&gt;
 &lt;p&gt;He recognized this at the beginning.  The earliest Linux release notes
 said, &lt;a
-href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+<span 
class="removed"><del><strong>href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
 &ldquo;Most of the tools used with linux are GNU software and are under the
 GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
 for more info&rdquo;&lt;/a&gt;.&lt;/p&gt;
@@ -1435,7 +1462,7 @@
 a big job, and it's not clearly necessary.  The only thing ethically
 wrong with Linux as a kernel is its inclusion of firmware
 &ldquo;blobs&rdquo;; the best fix for that problem
-is &lt;a href="http://fsf.org/campaigns/priority-projects"&gt; developing
+is &lt;a <span 
class="removed"><del><strong>href="http://fsf.org/campaigns/priority-projects"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.fsf.org/campaigns/priority-projects"&gt;</em></ins></span>
 developing
 free replacement for the blobs&lt;/a&gt;.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -1444,12 +1471,13 @@
     it? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#lost"&gt;#lost&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 This isn't a battle, it is a campaign of education.  What to call the
 system is not a single decision, to be made at one moment by
 &ldquo;society&rdquo;: each person, each organization, can decide what
 name to use.  You can't make others say &ldquo;GNU/Linux&rdquo;, but
 you can decide to call the system &ldquo;GNU/Linux&rdquo;
-yourself&mdash;and by doing so, you will help educate others.
+yourself&mdash;and by doing so, you will help educate <span 
class="removed"><del><strong>others.</strong></del></span> <span 
class="inserted"><ins><em>others.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="whatgood"&gt;Society has made its
@@ -1457,6 +1485,7 @@
     &ldquo;GNU/Linux&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#whatgood"&gt;#whatgood&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 This is not an all-or-nothing situation: correct and incorrect
 pictures are being spread more or less by various people.  If you call
 the system &ldquo;GNU/Linux&rdquo;, you will help others learn the system's 
true
@@ -1464,7 +1493,7 @@
 everywhere on your own, any more than we can, but you can help.  If
 only a few hundred people see you use the term &ldquo;GNU/Linux&rdquo;, you 
will
 have educated a substantial number of people with very little work.
-And some of them will spread the correction to others.
+And some of them will spread the correction to <span 
class="removed"><del><strong>others.</strong></del></span> <span 
class="inserted"><ins><em>others.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="explain"&gt;Wouldn't it be better to call
@@ -1535,39 +1564,44 @@
     is it legitimate to rename the operating system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#rename"&gt;#rename&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 We are not renaming anything; we have been calling this system 
&ldquo;GNU&rdquo;
 ever since we announced it in 1983.  The people who tried to rename
-it to &ldquo;Linux&rdquo; should not have done so.&lt;/dd&gt;
+it to &ldquo;Linux&rdquo; should not have done <span 
class="removed"><del><strong>so.&lt;/dd&gt;</strong></del></span> <span 
class="inserted"><ins><em>so.&lt;/p&gt;
+&lt;/dd&gt;</em></ins></span>
 
 &lt;dt id="force"&gt;Isn't it wrong to force people to call
 the system &ldquo;GNU/Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#force"&gt;#force&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 It would be wrong to force them, and we don't try.  We call the system
-&ldquo;GNU/Linux&rdquo;, and we ask you to do it too.
+&ldquo;GNU/Linux&rdquo;, and we ask you to do it <span 
class="removed"><del><strong>too.</strong></del></span> <span 
class="inserted"><ins><em>too.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="whynotsue"&gt;Why not sue people who call
 the whole system &ldquo;Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#whynotsue"&gt;#whynotsue&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 There are no legal grounds to sue them, but since we believe in
 freedom of speech, we wouldn't want to do that anyway.  We ask people
-to call the system &ldquo;GNU/Linux&rdquo; because that is the right thing to 
do.
+to call the system &ldquo;GNU/Linux&rdquo; because that is the right thing to 
<span class="removed"><del><strong>do.</strong></del></span> <span 
class="inserted"><ins><em>do.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="require"&gt;Shouldn't you put something in
     the GNU GPL to require people to call the system &ldquo;GNU&rdquo;? 
&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#require"&gt;#require&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 The purpose of the GNU GPL is to protect the users' freedom from those
 who would make proprietary versions of free software.  While it is
 true that those who call the system &ldquo;Linux&rdquo; often do things that 
limit
-the users' freedom, such as bundling non-free software with the
-GNU/Linux system or even developing non-free software for such use,
+the users' freedom, such as bundling <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software with the
+GNU/Linux system or even developing <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software for such use,
 the mere act of calling the system &ldquo;Linux&rdquo; does not, in itself, 
deny
 users their freedom.  It seems improper to make the GPL restrict what
-name people can use for the system.
+name people can use for the <span 
class="removed"><del><strong>system.</strong></del></span> <span 
class="inserted"><ins><em>system.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="BSDlicense"&gt;Since you objected to the original BSD license's
@@ -1615,17 +1649,19 @@
 it &ldquo;Linux&rdquo;, doesn't that make it right? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#somanyright"&gt;#somanyright&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-We don't think that the popularity of an error makes it the truth.
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
+We don't think that the popularity of an error makes it the <span 
class="removed"><del><strong>truth.</strong></del></span> <span 
class="inserted"><ins><em>truth.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="knownname"&gt;Isn't it better to call the
     system by the name most users already know? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#knownname"&gt;#knownname&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo;
 includes &ldquo;Linux&rdquo;, they will recognize what you're talking
 about.  If you add &ldquo;(often erroneously referred to as
-&lsquo;Linux&rsquo;)&rdquo; once in a while, they will all understand.
+&lsquo;Linux&rsquo;)&rdquo; once in a while, they will all <span 
class="removed"><del><strong>understand.</strong></del></span> <span 
class="inserted"><ins><em>understand.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="winning"&gt;Many people care about what's
@@ -1635,7 +1671,7 @@
 
 &lt;dd&gt;
 To care only about what's convenient or who's winning is an amoral
-approach to life.  Non-free software is an example of that amoral
+approach to life.  <span 
class="removed"><del><strong>Non-free</strong></del></span>  <span 
class="inserted"><ins><em>Nonfree</em></ins></span> software is an example of 
that amoral
 approach and thrives on it.  Thus, in the long run it would be
 self-defeating for us to adopt that approach.  We will continue
 talking in terms of right and wrong.
@@ -1644,8 +1680,7 @@
 &lt;/dd&gt;
 
 &lt;/dl&gt;
-<span class="inserted"><ins><em>&lt;/div&gt;
-&lt;/div&gt;</em></ins></span>
+<span class="inserted"><ins><em>&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;
@@ -1694,7 +1729,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2001, <span class="removed"><del><strong>2006, 2007, 
2008,</strong></del></span> <span 
class="inserted"><ins><em>2006-2008,</em></ins></span> 2010, 2011, 2013, <span 
class="removed"><del><strong>2014, 2015, 2016, 2017, 2018</strong></del></span> 
<span class="inserted"><ins><em>2014-2018, 2020, 2021</em></ins></span>
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>2001, 2006, 2007, 
2008, 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018</strong></del></span> 
<span class="inserted"><ins><em>2001-2011, 2013-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"
@@ -1705,7 +1740,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/04/30 06:36:13 $
+$Date: 2021/08/30 13:34:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: gnu/po/gnu-linux-faq.it.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.it.po,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- gnu/po/gnu-linux-faq.it.po  30 Apr 2021 06:36:13 -0000      1.54
+++ gnu/po/gnu-linux-faq.it.po  30 Aug 2021 13:34:53 -0000      1.55
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2018-05-31 21:30+0200\n"
 "Last-Translator: Andrea Pescetti <pescetti@gnu.org>\n"
 "Language-Team: Italian <www-it-traduzioni@gnu.org>\n"
@@ -23,32 +23,18 @@
 msgstr ""
 "Domande ricorrenti su GNU/Linux - Progetto GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU/Linux FAQ"
 msgstr ""
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 # || No change detected.  The change might only be in amounts of spaces.
 #, fuzzy
 #| msgid "by Richard Stallman"
 msgid "by Richard Stallman"
 msgstr "di Richard Stallman"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
-"linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a href=\"/"
-"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Per saperne di più su questo tema, si consiglia di leggere la nostra pagina "
-"su <a href=\"/gnu/linux-and-gnu.html\">Linux ed il sistema GNU</a>, la "
-"nostra pagina su <a href=\"/gnu/why-gnu-linux.html\">Perché GNU/Linux?</a> e 
"
-"la nostra pagina su <a href=\"/gnu/gnu-users-never-heard-of-gnu.html"
-"\">Utenti GNU che non hanno mai sentito parlare di GNU</a>."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When people see that we use and recommend the name GNU/Linux for a system "
 "that many others call just &ldquo;Linux&rdquo;, they ask many questions.  "
@@ -58,6 +44,13 @@
 "un sistema che molti altri chiamano solo &ldquo;Linux&rdquo;, ci fa tante "
 "domande. Ecco alcune delle domande più comuni, e le nostre risposte."
 
+#. type: Content of: <div><div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "Indice"
+
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<a href=\"#why\">Why do you call the system we use GNU/Linux and not Linux?</"
@@ -670,7 +663,34 @@
 "non di giusto e sbagliato. Non potreste cambiare approccio così da ottenere "
 "più supporto da loro?</a>"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
+# | {+System</a>,+} our page on <a href=\"/gnu/why-gnu-linux.html\">Why
+# | GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our page on <a href=\"/"
+#| "gnu/linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a "
+#| "href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
+"linux-and-gnu.html\">Linux and the GNU System</a>, our page on <a href=\"/"
+"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Per saperne di più su questo tema, si consiglia di leggere la nostra pagina "
+"su <a href=\"/gnu/linux-and-gnu.html\">Linux ed il sistema GNU</a>, la "
+"nostra pagina su <a href=\"/gnu/why-gnu-linux.html\">Perché GNU/Linux?</a> e 
"
+"la nostra pagina su <a href=\"/gnu/gnu-users-never-heard-of-gnu.html"
+"\">Utenti GNU che non hanno mai sentito parlare di GNU</a>."
+
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you call the system we use GNU/Linux and not Linux? <span class="
 "\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>"
@@ -678,7 +698,7 @@
 "Perché lo chiamate GNU/Linux e non Linux? <span class=\"anchor-reference-id"
 "\">(<a href=\"#why\">#why</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Most operating system distributions based on Linux as kernel are basically "
 "modified versions of the GNU operating system.  We began developing GNU in "
@@ -698,11 +718,11 @@
 "costituisce il più grande contributo all'intero sistema. Anche la visione di 
"
 "base era la nostra."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "In fairness, we ought to get at least equal mention."
 msgstr "Sarebbe giusto se ricevessimo almeno egual menzione."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and the GNU System</a> and <a "
 "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
@@ -714,7 +734,7 @@
 "sentito parlare di GNU</a> per ulteriori spiegazioni, e <a href=\"/gnu/the-"
 "gnu-project.html\">Il Progetto GNU</a> per cenni storici."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why is the name important? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
@@ -722,7 +742,7 @@
 "Perché il nome è così importante? <span class=\"anchor-reference-id\">(<a "
 "href=\"#whycare\">#whycare</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Although the developers of Linux, the kernel, are contributing to the free "
 "software community, many of them do not care about freedom.  People who "
@@ -737,7 +757,7 @@
 "appartiene alla nostra comunità. Questo porta loro a dare peso eccessivo "
 "alle opinioni di questi sviluppatori."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Calling the system GNU/Linux recognizes the role that our idealism played in "
 "building our community, and <a href=\"/gnu/why-gnu-linux.html\">helps the "
@@ -748,7 +768,7 @@
 "html\">aiuta la gente a riconoscere l'importanza pratica di questi ideali</"
 "a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the real relationship between GNU and Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#what\">#what</a>)</span>"
@@ -756,7 +776,7 @@
 "Qual è la vera relazione tra GNU e Linux? <span class=\"anchor-reference-id"
 "\">(<a href=\"#what\">#what</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU operating system and the Linux kernel are separate software projects "
 "that do complementary jobs.  Typically they are packaged in a <a href=\"/"
@@ -766,7 +786,7 @@
 "svolgono compiti complementari. Tipicamente li si usa insieme, in quella che "
 "si chiama una <a href=\"/distros/distros.html\">distribuzione GNU/Linux</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How did it come about that most people call the system &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
@@ -776,7 +796,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; is a confusion that has spread faster "
 "than the corrective information."
@@ -784,7 +804,7 @@
 "Chiamare il sistema &ldquo;Linux&rdquo; è una confusione che si è diffusa "
 "più rapidamente dell'informazione corretta."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who combined Linux with the GNU system were not aware that that's "
 "what their activity amounted to.  They focused their attention on the piece "
@@ -802,7 +822,7 @@
 "problema presentato da questa pratica ed iniziassimo a chiedere alla gente "
 "di correggerla ma era già troppo tardi, la confusione aveva già preso 
piede."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the people who call the system &ldquo;Linux&rdquo; have never heard "
 "why that's not the right thing.  They saw others using that name and assume "
@@ -822,7 +842,7 @@
 "diffuse non fanno altro che rinforzare l'idea che il sistema si chiami "
 "&ldquo;Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Many of the questions in this file represent people's attempts to justify "
 "the name they are accustomed to using."
@@ -830,7 +850,7 @@
 "Molte domande contenute in questo file rappresentano i tentativi della gente "
 "di giustificare il nome che è solita usare."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we always say &ldquo;GNU/Linux&rdquo; instead of &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
@@ -839,7 +859,7 @@
 "Linux&rdquo;? <span class=\"anchor-reference-id\">(<a href=\"#always"
 "\">#always</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not always&mdash;only when you're talking about the whole system.  When "
 "you're referring specifically to the kernel, you should call it &ldquo;"
@@ -849,7 +869,7 @@
 "riferimento specificamente al kernel, dovreste chiamarlo &ldquo;"
 "Linux&rdquo;, il nome ad esso assegnato dal suo sviluppatore."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
 "call the whole system by the same name as the kernel.  This causes many "
@@ -865,7 +885,7 @@
 "sistema &ldquo;GNU/Linux&rdquo; ed il kernel &ldquo;Linux&rdquo;, evitate "
 "l'ambiguità."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Would Linux have achieved the same success if there had been no GNU? <span "
 "class=\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</"
@@ -874,7 +894,7 @@
 "Avrebbe Linux ottenuto lo stesso successo senza di GNU? <span class=\"anchor-"
 "reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In that alternative world, there would be nothing today like the GNU/Linux "
 "system, and probably no free operating system at all.  No one attempted to "
@@ -888,7 +908,7 @@
 "parte il Progetto GNU e (successivamente) Berkley CSRG, al quale è stato "
 "proprio GNU a chiedere di liberare il proprio codice."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds was partly influenced by a speech about GNU in Finland in "
 "1990.  It's possible that even without this influence he might have written "
@@ -903,7 +923,7 @@
 "decise di ri-rilasciarlo sotto la GNU GPL. (Leggete le note di rilascio "
 "della versione 0.12)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Even if Torvalds had released Linux under some other free software license, "
 "a free kernel alone would not have made much difference to the world.  The "
@@ -915,7 +935,7 @@
 "mondo. L'importanza di Linux viene dal suo far parte di un contesto più "
 "vasto, un sistema operativo libero: GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better for the community if you did not divide people with "
 "this request? <span class=\"anchor-reference-id\">(<a href=\"#divide"
@@ -924,7 +944,7 @@
 "Non sarebbe meglio per la comunità non chiedere qualcosa di così divisivo? "
 "<span class=\"anchor-reference-id\">(<a href=\"#divide\">#divide</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
 "people.  We are asking them to give the GNU Project credit for the GNU "
@@ -935,7 +955,7 @@
 "riconoscimento meritato per il sistema operativo GNU - non è nostra "
 "intenzione criticare o respingere qualcuno in particolare."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, there are people who do not like our saying this.  Sometimes those "
 "people push us away in response.  On occasion they are so rude that one "
@@ -950,7 +970,7 @@
 "silenziarci ma purtroppo divide la nostra comunità, quindi sarebbe meglio "
 "convincerli a smettere."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, this is only a secondary cause of division in our community.  The "
 "largest division in the community is between people who appreciate free "
@@ -967,7 +987,7 @@
 "software libero in quanto modello di sviluppo efficiente (il movimento open "
 "source)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This disagreement is not just a matter of names&mdash;it is a matter of "
 "differing basic values.  It is essential for the community to see and think "
@@ -983,7 +1003,7 @@
 "href=\"/philosophy/open-source-misses-the-point.html\">Perché l'“Open "
 "Source” manca l'obiettivo del Software Libero</a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The disagreement over values partially aligns with the amount of attention "
 "people pay to the GNU Project's role in our community.  People who value "
@@ -1008,7 +1028,7 @@
 "noi che diamo valore alla libertà riusciamo a convincere tutti gli altri "
 "(non sarà facile) o soccombiamo del tutto (speriamo di no)."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Doesn't the GNU project support an individual's free speech rights to call "
 "the system by any name that individual chooses? <span class=\"anchor-"
@@ -1019,7 +1039,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#freespeech\">#freespeech</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Yes, indeed, we believe you have a free speech right to call the operating "
 "system by any name you wish.  We ask that people call it GNU/Linux as a "
@@ -1033,7 +1053,7 @@
 "promuovere i valori di libertà rappresentati da GNU, e per informare gli "
 "altri di questi valori che hanno portato alla creazione del sistema."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since everyone knows the role of GNU in developing the system, doesn't the "
 "&ldquo;GNU/&rdquo; in the name go without saying? <span class=\"anchor-"
@@ -1044,7 +1064,7 @@
 "\"anchor-reference-id\">(<a href=\"#everyoneknows\">#everyoneknows</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Experience shows that the system's users, and the computer-using public in "
 "general, often know nothing about the GNU system.  Most articles about the "
@@ -1059,7 +1079,7 @@
 "\">Utenti GNU che non hanno mai sentito parlare di GNU</a> affronta questo "
 "argomento in profondità."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who say this are probably geeks thinking of the geeks they know.  "
 "Geeks often do know about GNU, but many have a completely wrong idea of what "
@@ -1072,7 +1092,7 @@
 "raccolta di <a href=\"#tools\">&ldquo;utilità&rdquo;</a>, oppure un progetto 
"
 "con il fine di sviluppare utilità."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The wording of this question, which is typical, illustrates another common "
 "misconception.  To speak of &ldquo;GNU's role&rdquo; in developing something "
@@ -1086,7 +1106,7 @@
 "sistema operativo. Ha senso parlare del ruolo del Progetto GNU in questa "
 "oppure in altre attività, non del ruolo di GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since I know the role of GNU in this system, why does it matter what name I "
 "use? <span class=\"anchor-reference-id\">(<a href="
@@ -1096,7 +1116,7 @@
 "<span class=\"anchor-reference-id\">(<a href="
 "\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your words don't reflect your knowledge, you don't teach others.  Most "
 "people who have heard of the GNU/Linux system think it is &ldquo;"
@@ -1109,7 +1129,7 @@
 "interamente da Linus Torvalds, e che è stato creato allo scopo di essere "
 "&ldquo;open source&rdquo;. Se non siete voi a correggerli, chi lo farà?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't shortening &ldquo;GNU/Linux&rdquo; to &ldquo;Linux&rdquo; just like "
 "shortening &ldquo;Microsoft Windows&rdquo; to &ldquo;Windows&rdquo;? <span "
@@ -1120,7 +1140,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#windows\">#windows</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It's useful to shorten a frequently-used name, but not if the abbreviation "
 "is misleading."
@@ -1128,7 +1148,7 @@
 "Fa comodo accorciare un nome usato di frequente, a patto che l'abbreviazione "
 "non sia fuorviante."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Almost everyone in developed countries really does know that the &ldquo;"
 "Windows&rdquo; system is made by Microsoft, so shortening &ldquo;Microsoft "
@@ -1143,7 +1163,7 @@
 "GNU/Linux&rdquo; a &ldquo;Linux&rdquo; dà invece l'idea sbagliata sulle "
 "origini del sistema."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The question is itself misleading because GNU and Microsoft are not the same "
 "kind of thing.  Microsoft is a company; GNU is an operating system."
@@ -1151,7 +1171,7 @@
 "La domanda stessa è ingannevole in quanto GNU e Microsoft non fanno parte "
 "della stessa categoria. Microsoft è un'azienda; GNU è un sistema operativo."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't GNU a collection of programming tools that were included in Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
@@ -1159,7 +1179,7 @@
 "Non è forse GNU una raccolta di utilità di sviluppo incluse con Linux? 
<span "
 "class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "People who think that Linux is an entire operating system, if they hear "
 "about GNU at all, often get a wrong idea of what GNU is.  They may think "
@@ -1178,7 +1198,7 @@
 "incorniciare in una mentalità per la quale il sistema operativo viene "
 "chiamato &ldquo;Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Project was named after the GNU operating system&mdash;it's the "
 "project to develop the GNU system.  (See <a href=\"/gnu/initial-announcement."
@@ -1188,7 +1208,7 @@
 "progetto per lo sviluppo del sistema GNU. (Vedete <a href=\"/gnu/initial-"
 "announcement.html\">l'annuncio originale del 1983</a>.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We developed programs such as GCC, GNU Emacs, GAS, GLIBC, BASH, etc., "
 "because we needed them for the GNU operating system.  GCC, the GNU Compiler "
@@ -1202,7 +1222,7 @@
 "GNU. Noi, i membri del Progetto GNU, abbiamo sviluppato Ghostscript, "
 "GNUCash, GNU Chess e GNOME per il sistema GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the difference between an operating system and a kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
@@ -1210,7 +1230,7 @@
 "Qual è la differenza tra un sistema operativo ed un kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "An operating system, as we use the term, means a collection of programs that "
 "are sufficient to use the computer to do a wide variety of jobs.  A general "
@@ -1222,7 +1242,7 @@
 "compiti. Un sistema operativo generico, per essere completo, deve essere "
 "capace di completare le varie operazioni richieste dagli utenti."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The kernel is one of the programs in an operating system&mdash;the program "
 "that allocates the machine's resources to the other programs that are "
@@ -1233,7 +1253,7 @@
 "esecuzione. Il kernel si prende anche cura dell'avviamento e della chiusura "
 "degli altri programmi."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "To confuse matters, some people use the term &ldquo;operating system&rdquo; "
 "to mean &ldquo;kernel&rdquo;.  Both uses of the term go back many years.  "
@@ -1255,7 +1275,7 @@
 "modello di Unix per il sistema GNU, quando diciamo &ldquo;sistema "
 "operativo&rdquo; intendiamo la stessa cosa."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the time when people speak of the &ldquo;Linux operating "
 "system&rdquo; they are using &ldquo;operating system&rdquo; in the same "
@@ -1273,7 +1293,7 @@
 "prego di aggiungere &ldquo;kernel&rdquo; per evitare equivoci sul tipo di "
 "software discusso."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
@@ -1285,7 +1305,7 @@
 "sistema operativo&rdquo;, non c'è problema. A quel punto parlerete di "
 "distribuzioni di sistema GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The kernel of a system is like the foundation of a house.  How can a house "
 "be almost complete when it doesn't have a foundation? <span class=\"anchor-"
@@ -1295,7 +1315,7 @@
 "essere quasi completa quando manca di fondamenta? <span class=\"anchor-"
 "reference-id\">(<a href=\"#house\">#house</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "A kernel is not much like the foundation of a house because building an "
 "operating system is not much like building a house."
@@ -1303,7 +1323,7 @@
 "Un kernel non è simile alle fondamenta di una casa perché costruire un "
 "sistema operativo non è la stessa cosa che costruire una casa."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A house is built from lots of little general parts that are cut and put "
 "together in situ.  They have to be put together from the bottom up.  Thus, "
@@ -1315,7 +1335,7 @@
 "Quindi, quando le fondamenta non sono state costruite, nessuna parte "
 "fondamentale è stata costruita; non c'è altro che un buco nel pavimento."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "By contrast, an operating system consists of complex components that can be "
 "developed in any order.  When you have developed most of the components, "
@@ -1333,7 +1353,7 @@
 "un altro modulo essenziale, questo rifletterebbe la situazione in cui il "
 "sistema GNU si trovava nel 1992."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't the kernel the brain of the system? <span class=\"anchor-reference-id"
 "\">(<a href=\"#brain\">#brain</a>)</span>"
@@ -1341,7 +1361,7 @@
 "Non è forse il kernel il cervello del sistema? <span class=\"anchor-"
 "reference-id\">(<a href=\"#brain\">#brain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A computer system is not much like a human body, and no part of it plays a "
 "role comparable to that of the brain in a human."
@@ -1349,7 +1369,7 @@
 "Un sistema informatico non assomiglia al corpo umano, e non c'è parte di "
 "esso che compia un ruolo comparabile a quello del cervello negli umani."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't writing the kernel most of the work in an operating system? <span "
 "class=\"anchor-reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</"
@@ -1359,11 +1379,11 @@
 "di un sistema operativo?<span class=\"anchor-reference-id\">(<a href="
 "\"#kernelmost\">#kernelmost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "No, many components take a lot of work."
 msgstr "No, diversi componenti richiedono grande impegno."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Isn't writing-]{+An operating system requires a kernel.  Since+} the
 # | [-kernel most of-] {+GNU Project didn't develop a kernel, how can+} the
 # | [-work in an operating system? <span-] {+system be GNU?<span+}
@@ -1384,7 +1404,7 @@
 "di un sistema operativo?<span class=\"anchor-reference-id\">(<a href="
 "\"#kernelmost\">#kernelmost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The people who argue that way for calling the system &ldquo;Linux&rdquo; are "
 "using a double standard.  An operating system requires compilers, editors, "
@@ -1393,20 +1413,20 @@
 "any of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "That standard is too strict, not the right way to judge the contributions of "
 "any contributor."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds made an important contribution to the operating system we "
 "use; the GNU Project started earlier and contributed much more.  The name "
 "&ldquo;GNU/Linux&rdquo; gives credit to each."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How can GNU be an operating system, if I can't get something called &ldquo;"
 "GNU&rdquo; and install it? <span class=\"anchor-reference-id\">(<a href="
@@ -1416,7 +1436,7 @@
 "chiamato &ldquo;GNU&rdquo; ed installarlo? <span class=\"anchor-reference-id"
 "\">(<a href=\"#notinstallable\">#notinstallable</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Many <a href=\"/distros/distros.html\"> packaged and installable versions of "
 "GNU</a> are available.  None of them is called simply &ldquo;GNU&rdquo;, but "
@@ -1426,7 +1446,7 @@
 "distribuibili ed installabili di GNU</a>. Nessuna di queste si chiama "
 "esplicitamente &ldquo;GNU&rdquo; ma non sono altro che GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We expected to release the GNU system packaged for installation, but this "
 "plan was overtaken by events: in 1992 others were already packaging GNU "
@@ -1447,7 +1467,7 @@
 "destinato alla versione del sistema allora incompleta basata sul kernel GNU "
 "Hurd."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Hurd kernel never became sufficiently ready; we only recommend it to "
 "those interested in working on it.  So we never packaged GNU with the GNU "
@@ -1458,7 +1478,7 @@
 "con il kernel GNU Hurd, anche se esiste una distribuzione di Debian che ne "
 "fa uso chiamata Debian GNU/Hurd."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are now developing an advanced Scheme-based package manager called Guix "
 "and a complete system distribution based on it called the <a href=\"/"
@@ -1471,7 +1491,7 @@
 "Distribution</a> o GuixSD. Questo lavoro include una riorganizzazione di "
 "gran parte del sistema GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We never took the last step of packaging GNU under the name &ldquo;"
 "GNU&rdquo;, but that doesn't alter what kind of thing GNU is.  GNU is an "
@@ -1481,7 +1501,7 @@
 "&ldquo;GNU&rdquo; ma ciò non cambia quello che GNU è nei fatti, e cioè un "
 "sistema operativo."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "We're calling the whole system after the kernel, Linux.  Isn't it normal to "
 "name an operating system after a kernel? <span class=\"anchor-reference-id\">"
@@ -1491,7 +1511,7 @@
 "lo stesso nome del kernel al sistema operativo? <span class=\"anchor-"
 "reference-id\">(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "That practice seems to be very rare&mdash;we can't find any examples other "
 "than the misuse of the name &ldquo;Linux&rdquo;.  Normally an operating "
@@ -1508,7 +1528,7 @@
 "riferimento come &ldquo;il kernel di ...&rdquo; o &ldquo;il kernel ..."
 "&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Because those two constructions are used synonymously, the expression &ldquo;"
 "the Linux kernel&rdquo; can easily be misunderstood as meaning &ldquo;the "
@@ -1522,7 +1542,7 @@
 "che un kernel. Potete evitare questo fraintendimento dicendo o scrivendo "
 "&ldquo;il kernel, Linux&rdquo; o &ldquo;Linux, il kernel&rdquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can another system have &ldquo;the feel of Linux&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
@@ -1530,7 +1550,7 @@
 "Può un altro sistema &ldquo;sembrare Linux&rdquo;? <span class=\"anchor-"
 "reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is no such thing as the &ldquo;feel of Linux&rdquo; because Linux has "
 "no user interfaces.  Like any modern kernel, Linux is a base for running "
@@ -1544,7 +1564,7 @@
 "L'interazione umana con GNU/Linux è solitamente processata tramite altri "
 "programmi ed è da essi che viene il &ldquo;sembrare&rdquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  How about "
 "recommending a shorter name? <span class=\"anchor-reference-id\">(<a href="
@@ -1554,7 +1574,7 @@
 "cercare un nome più corto? <span class=\"anchor-reference-id\">(<a href="
 "\"#long\">#long</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "For a while we tried the name &ldquo;LiGNUx&rdquo;, which combines the words "
 "&ldquo;GNU&rdquo; and &ldquo;Linux&rdquo;.  The reaction was very bad.  "
@@ -1565,7 +1585,7 @@
 "La reazione non è stata tra le più calorose. La maggior parte della gente "
 "trova &ldquo;GNU/Linux&rdquo; più tollerabile."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
 "call it &ldquo;GNU/Linux&rdquo; <a href=\"#justgnu\"> for the reasons given "
@@ -1575,7 +1595,7 @@
 "chiamiamo &ldquo;GNU/Linux&rdquo; <a href=\"#justgnu\"> per le ragioni sotto "
 "descritte</a>"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How about calling the system &ldquo;GliNUx&rdquo; (instead of &ldquo;GNU/"
 "Linux&rdquo;)? <span class=\"anchor-reference-id\">(<a href="
@@ -1585,7 +1605,7 @@
 "Linux&rdquo;)? <span class=\"anchor-reference-id\">(<a href="
 "\"#long1\">#long1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The name &ldquo;GNU&rdquo; does not visibly appear in &ldquo;Glinux,&rdquo; "
 "so most people would not notice it is there.  Even if it is capitalized as "
@@ -1597,7 +1617,7 @@
 "evidenziarlo con le maiuscole, scrivendo quindi &ldquo;GliNUx&rdquo;, non "
 "funzionerebbe per fare capire il riferimento a GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be comparable to writing &ldquo;GNU/Linux,&rdquo; but putting "
 "&ldquo;GNU/&rdquo; in print so small that most people could not read it."
@@ -1605,7 +1625,7 @@
 "Sarebbe come scrivere &ldquo;GNU/Linux&rdquo; ma mettendo &ldquo;GNU/&rdquo; "
 "in caratteri minuscoli, illeggibili per la maggioranza delle persone."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  Why should "
 "I go to the trouble of saying &ldquo;GNU/&rdquo;? <span class=\"anchor-"
@@ -1615,7 +1635,7 @@
 "tempo a dire &ldquo;GNU/&rdquo;? <span class=\"anchor-reference-id\">(<a "
 "href=\"#long2\">#long2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
 "the system that we developed, can't you take one second to recognize our "
@@ -1625,7 +1645,7 @@
 "sistema da noi sviluppato, cosa è un secondo per riconoscere il nostro "
 "impegno?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Unfortunately, &ldquo;GNU/Linux&rdquo; is five syllables. People won't use "
 "such a long term. Shouldn't you find a shorter one? <span class=\"anchor-"
@@ -1635,7 +1655,7 @@
 "vuole usare un termine così lungo. Perché non trovarne un più corto? <span 
"
 "class=\"anchor-reference-id\">(<a href=\"#long3\">#long3</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, &ldquo;GNU/Linux&rdquo; is only four syllables.  &ldquo;"
 "Unfortunately&rdquo; is five syllables, yet people show no sign of "
@@ -1645,7 +1665,7 @@
 "Sfortunatamente&rdquo; ha sei sillabe e questo non scoraggia la gente "
 "dall'usare quella parola. "
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-How about calling-]{+Stallman doesn't ask us to call him &ldquo;Richard
 # | Matthew Stallman&rdquo; every+} the [-system &ldquo;GliNUx&rdquo; (instead
 # | of &ldquo;GNU/Linux&rdquo;)?-] {+time.  So why ask us to say
@@ -1666,21 +1686,21 @@
 "Linux&rdquo;)? <span class=\"anchor-reference-id\">(<a href="
 "\"#long1\">#long1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Omitting &ldquo;Matthew&rdquo; does not misrepresent anything important "
 "about Stallman's nature, origin, ideas or purpose.  Omitting &ldquo;"
 "GNU&rdquo; does misrepresent those things about the GNU/Linux system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is an example of a frequent way of hiding a fallacy: to bury it inside "
 "a misleading analogy.  A better analogy would be, &ldquo;Why shouldn't we "
 "call Stallman &lsquo;Torvalds&rsquo;?&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since Linux is a secondary contribution, would it be false to the facts to "
 "call the system simply &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id"
@@ -1690,7 +1710,7 @@
 "sistema semplicemente &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id\">"
 "(<a href=\"#justgnu\">#justgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would not be false to the facts, but it is not the best thing to do.  "
 "Here are the reasons we call that system version &ldquo;GNU/Linux&rdquo; "
@@ -1700,7 +1720,7 @@
 "ragioni per cui chiamiamo quella particolare versione del sistema &ldquo;GNU/"
 "Linux&rdquo; anziché &ldquo;GNU&rdquo;:"
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It's not exactly GNU&mdash;it has a different kernel (that is, Linux).  "
 "Distinguishing GNU/Linux from GNU is useful."
@@ -1708,7 +1728,7 @@
 "Non si tratta esattamente di GNU - ha un kernel diverso (che sarebbe Linux). "
 "Distinguere GNU/Linux da GNU è utile."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It would be ungentlemanly to ask people to <em>stop</em> giving any credit "
 "to Linus Torvalds.  He did write an important component of the system.  We "
@@ -1728,7 +1748,7 @@
 "maniera onorevole ed aperta, senza privarlo del riconoscimento da lui "
 "meritato per i suoi contributi al sistema."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
 "&ldquo;GNU&rdquo; they may simply not recognize we're talking about the same "
@@ -1740,7 +1760,7 @@
 "e non capire che si sta parlando dello stesso sistema. Se diciamo &ldquo;GNU/"
 "Linux&rdquo;, essa può fare un collegamento a quello che già conosce."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "I would have to pay a fee if I use &ldquo;Linux&rdquo; in the name of a "
 "product, and that would also apply if I say &ldquo;GNU/Linux&rdquo;.  Is it "
@@ -1754,7 +1774,7 @@
 "di pagare? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There's nothing wrong in calling the system &ldquo;GNU&rdquo;; basically, "
 "that's what it is.  It is nice to give Linus Torvalds a share of the credit "
@@ -1764,7 +1784,7 @@
 "perché sarebbe la verità. Sarebbe giusto dare a Linus Torvalds parte del "
 "credito ma non siete costretti a pagare per questo privilegio."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "So if you want to refer to the system simply as &ldquo;GNU&rdquo;, to avoid "
 "paying the fee for calling it &ldquo;Linux&rdquo;, we won't criticize you."
@@ -1773,7 +1793,7 @@
 "per evitare di pagare l'imposta presente sul marchio &ldquo;Linux&rdquo;, "
 "non vi criticheremo."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today; it includes "
 "TeX, X11, Apache, Perl, and many more programs.  Don't your arguments imply "
@@ -1787,7 +1807,7 @@
 "sarebbe un nome ridicolmente lungo? <span class=\"anchor-reference-id\">(<a "
 "href=\"#many\">#many</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "What we say is that you ought to give the system's principal developer a "
 "share of the credit.  The principal developer is the GNU Project, and the "
@@ -1797,7 +1817,7 @@
 "del sistema la giusta porzione di credito. Lo sviluppatore principale è il "
 "Progetto GNU ed il sistema fondamentalmente è GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you feel even more strongly about giving credit where it is due, you "
 "might feel that some secondary contributors also deserve credit in the "
@@ -1813,7 +1833,7 @@
 "chiamare il sistema GNU/X11/Linux, vi invitiamo a farlo. Se credete che Perl "
 "necessiti una menzione, e volete scrivere GNU/Linux/Perl, fatelo pure."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Since a long name such as GNU/X11/Apache/Linux/TeX/Perl/Python/FreeCiv "
 "becomes absurd, at some point you will have to set a threshold and omit the "
@@ -1827,7 +1847,7 @@
 "definito dove farlo e perciò qualunque fosse la vostra scelta, non saremo "
 "noi ad opporci."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Different threshold levels would lead to different choices of name for the "
 "system.  But one name that cannot result from concerns of fairness and "
@@ -1840,7 +1860,7 @@
 "può essere giusto dare credito esclusivamente ad un contributo secondario "
 "(Linux) omettendo quella primaria (GNU)."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Many companies contributed to-]{+systemd plays an important role in+}
 # | the {+GNU/Linux+} system as it is today; [-doesn't that mean-] {+are+} we
 # | [-ought-] {+obligated+} to call it [-GNU/Red&nbsp;Hat/Novell/Linux?-]
@@ -1863,7 +1883,7 @@
 "\"anchor-reference-id\">(<a href=\"#manycompanies\">#manycompanies</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "systemd is a fairly important component, but not as important as the kernel "
 "(Linux), nor as important as the basis of the system as a whole (GNU).  "
@@ -1871,7 +1891,7 @@
 "system &ldquo;GNU/systemd/Linux&rdquo;, there is nothing wrong with doing so."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today, but they don't "
 "insist on calling it XYZ/Linux.  Why should we treat GNU specially? <span "
@@ -1882,7 +1902,7 @@
 "in maniera diversa? <span class=\"anchor-reference-id\">(<a href=\"#others"
 "\">#others</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Thousands of projects have developed programs commonly included in today's "
 "GNU/Linux systems.  They all deserve credit for their contributions, but "
@@ -1894,7 +1914,7 @@
 "per i loro contributi, ma non essendo gli sviluppatori principali "
 "dell'intero sistema non lo richiedono."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is different because it is more than just a contributed program, more "
 "than just a collection of contributed programs.  GNU is the framework on "
@@ -1904,7 +1924,7 @@
 "raccolta di programmi contribuiti. GNU è la cornice all'interno della quale "
 "il sistema è stato costruito."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "GNU is a small fraction of the system nowadays, so why should we mention it? "
 "<span class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</"
@@ -1913,7 +1933,7 @@
 "GNU è ormai solo una piccola porzione del sistema, perché menzionarlo? 
<span "
 "class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In 2008, we found that GNU packages made up 15% of the &ldquo;main&rdquo; "
 "repository of the gNewSense GNU/Linux distribution.  Linux made up 1.5%.  So "
@@ -1925,7 +1945,7 @@
 "Linux ne costituiva l'1.5%. Lo stesso ragionamento potrebbe essere applicato "
 "ancora più fortemente contro l'uso del nome &ldquo;Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is a small fraction of the system nowadays, and Linux is an even smaller "
 "fraction.  But they are the system's core; the system was made by combining "
@@ -1936,7 +1956,7 @@
 "sistema è stato creato tramite la loro combinazione. Quindi, il nome &ldquo;"
 "GNU/Linux&rdquo; rimane appropriato."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many companies contributed to the system as it is today; doesn't that mean "
 "we ought to call it GNU/Red&nbsp;Hat/Novell/Linux? <span class=\"anchor-"
@@ -1947,7 +1967,7 @@
 "\"anchor-reference-id\">(<a href=\"#manycompanies\">#manycompanies</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is not comparable to Red Hat or Novell; it is not a company, or an "
 "organization, or even an activity.  GNU is an operating system.  (When we "
@@ -1961,7 +1981,7 @@
 "sviluppo del sistema GNU). Il sistema GNU/Linux è basato su GNU, ed è per "
 "questo che GNU merita di apparire nel suo nome."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Much of those companies' contribution to the GNU/Linux system lies in the "
 "code they have contributed to various GNU packages including GCC and GNOME.  "
@@ -1973,7 +1993,7 @@
 "GNU/Linux dà credito a quelle aziende oltre che al resto degli sviluppatori "
 "di GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
@@ -1983,7 +2003,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean "
@@ -1995,7 +2015,7 @@
 "significare o &ldquo;la versione GNU di Linux&rdquo; o &ldquo;Linux, parte "
 "di GNU&rdquo; - nessuno dei quali si addice alla situazione."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is not a GNU package; that is, it wasn't developed under the GNU "
 "Project's aegis or contributed specifically to the GNU Project.  Linus "
@@ -2007,14 +2027,32 @@
 "Linux Torvalds ha scritto Linux indipendentemente, come progetto personale. "
 "Quindi il significato &ldquo;Linux, parte di GNU&rdquo; non è valido."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | We're not talking about a distinct GNU version of Linux, the kernel.  The
+# | free GNU/Linux distros do have a <a
+# | [-href=\"http://directory.fsf.org/project/linux\";>separate-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>separate+} version
+# | of Linux</a>, since the &ldquo;standard&rdquo; version contains
+# | non[---]free firmware &ldquo;blobs&rdquo;.  If this were part of the GNU
+# | Project, it could be considered &ldquo;GNU Linux&rdquo;; but we would not
+# | want to call it that, because it would be too confusing.
+#, fuzzy
+#| msgid ""
+#| "We're not talking about a distinct GNU version of Linux, the kernel.  The "
+#| "free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/";
+#| "project/linux\">separate version of Linux</a>, since the &ldquo;"
+#| "standard&rdquo; version contains non-free firmware &ldquo;blobs&rdquo;.  "
+#| "If this were part of the GNU Project, it could be considered &ldquo;GNU "
+#| "Linux&rdquo;; but we would not want to call it that, because it would be "
+#| "too confusing."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
-"free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/project/";
-"linux\">separate version of Linux</a>, since the &ldquo;standard&rdquo; "
-"version contains non-free firmware &ldquo;blobs&rdquo;.  If this were part "
-"of the GNU Project, it could be considered &ldquo;GNU Linux&rdquo;; but we "
-"would not want to call it that, because it would be too confusing."
+"free GNU/Linux distros do have a <a href=\"https://directory.fsf.org/wiki/";
+"Linux-libre\">separate version of Linux</a>, since the &ldquo;"
+"standard&rdquo; version contains nonfree firmware &ldquo;blobs&rdquo;.  If "
+"this were part of the GNU Project, it could be considered &ldquo;GNU "
+"Linux&rdquo;; but we would not want to call it that, because it would be too "
+"confusing."
 msgstr ""
 "Non stiamo parlando di una versione del kernel Linux modificata da GNU. Le "
 "distribuzioni GNU/Linux libere hanno una <a href=\"http://directory.fsf.org/";
@@ -2024,7 +2062,7 @@
 "Linux&rdquo;;, ma abbiamo deciso di non chiamarla in questo modo per evitare "
 "ulteriori confusioni."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We're talking about a version of GNU, the operating system, distinguished by "
 "having Linux as the kernel.  A slash fits the situation because it means "
@@ -2037,7 +2075,7 @@
 "Input/Output&rdquo;). Questo sistema è la combinazione di GNU e Linux; "
 "quindi, &ldquo;GNU/Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are other ways to express &ldquo;combination&rdquo;.  If you think "
 "that a plus-sign is clearer, please use that.  In French, a hyphen is clear: "
@@ -2049,7 +2087,7 @@
 "tratto è più chiaro: &ldquo;GNU-Linux&rdquo;. In spagnolo, a volte diciamo "
 "&ldquo;GNU con Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Should we say &ldquo;GNU/BSD&rdquo; too?-]{+How is the name
 # | &ldquo;GNU/Linux&rdquo; pronounced?+} <span
 # | class=\"anchor-reference-id\">(<a [-href=\"#bsd\">#bsd</a>)</span>-]
@@ -2065,14 +2103,14 @@
 "Dovremmo allora dire anche &ldquo;GNU/BSD&rdquo;? <span class=\"anchor-"
 "reference-id\">(<a href=\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please pronounce it as &ldquo;GNU slash Linux.&rdquo; If you don't pronounce "
 "the slash, people will think you are saying &ldquo;GNU Linux,&rdquo; which "
 "is <a href=\"#whyslash\">not a suitable name for the combination</a>."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | Why do you write [-&ldquo;GNU/Linux&rdquo; instead of-] &ldquo;GNU
 # | [-Linux&rdquo;?-] {+Emacs&rdquo; rather than &ldquo;GNU/Emacs&rdquo;?+}
 # | <span class=\"anchor-reference-id\">(<a
@@ -2092,7 +2130,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 # | Following the rules of English, in the construction &ldquo;GNU
 # | [-Linux&rdquo;-] {+Emacs&rdquo;+} the word &ldquo;GNU&rdquo; modifies
 # | [-&ldquo;Linux&rdquo;.  This can mean either &ldquo;GNU's version of
@@ -2116,14 +2154,14 @@
 "significare o &ldquo;la versione GNU di Linux&rdquo; o &ldquo;Linux, parte "
 "di GNU&rdquo; - nessuno dei quali si addice alla situazione."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;GNU/Emacs&rdquo; would mean the combination of GNU, the operating "
 "system, and the program Emacs.  That doesn't fit this program, so &ldquo;GNU/"
 "Emacs&rdquo; is the wrong way to refer to it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why &ldquo;GNU/Linux&rdquo; rather than &ldquo;Linux/GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
@@ -2131,7 +2169,7 @@
 "Perché &ldquo;GNU/Linux&rdquo; al posto di &ldquo;Linux/GNU&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is right and proper to mention the principal contribution first.  The GNU "
 "contribution to the system is not only bigger than Linux and prior to Linux, "
@@ -2142,7 +2180,7 @@
 "quello che ha contributo Linux, siamo stati i primi ad iniziare l'intera "
 "attività."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the lowest "
 "level of the system and GNU fills technically higher levels."
@@ -2151,7 +2189,7 @@
 "livello più di base del sistema e che GNU si colloca ad un livello più alto 
"
 "dal punto di vista dell'architettura del sistema."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
 "lot better than what people usually do, which is to omit GNU entirely and "
@@ -2161,7 +2199,7 @@
 "ogni caso meglio di quello che la gente fa di solito, ovvero omettere GNU "
 "del tutto e dare a Linux credito per l'intero sistema."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
 "say anything about what the system consists of.  Why shouldn't they call it "
@@ -2173,7 +2211,7 @@
 "desiderano? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
 "\">#distronames</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling a system &ldquo;Foobar Linux&rdquo; implies that it's a flavor of "
 "&ldquo;Linux,&rdquo; and people <a href=\"#distronames\">understand it that "
@@ -2183,7 +2221,7 @@
 "&ldquo;Linux,&rdquo; e le persone lo <a href=\"#distronames\">vedranno in "
 "quel modo</a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If they called a GNU/Linux distro &ldquo;Foobar BSD,&rdquo; you would call "
 "that a mistake.  &ldquo;This system is not BSD,&rdquo; you would tell them.  "
@@ -2193,7 +2231,7 @@
 "concorderebbero che questo sarebbe un errore, e reagirebbero con frasi come: "
 "&ldquo;Questo sistema non è BSD,&rdquo;. Bene, non è nemmeno Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro is called &ldquo;Foobar Linux&rdquo;; doesn't that show it's "
 "really Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
@@ -2203,7 +2241,7 @@
 "abbastanza per provare che si tratta di Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#distronames\">#distronames</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It means that the people who make the &ldquo;Foobar Linux&rdquo; distro are "
 "repeating the common mistake. We appreciate that distributions like Debian, "
@@ -2217,7 +2255,7 @@
 "del loro nome ufficiale, e ci auguriamo che incoraggerete gli autori delle "
 "distribuzioni da voi usate a fare lo stesso."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's official name is &ldquo;Foobar Linux&rdquo;; isn't it wrong to "
 "call the distro anything but &ldquo;Foobar Linux&rdquo;? <span class="
@@ -2228,7 +2266,7 @@
 "<span class=\"anchor-reference-id\">(<a href="
 "\"#distronames1\">#distronames1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When they spread misinformation by changing &ldquo;GNU&rdquo; to &ldquo;"
 "Linux&rdquo;, and call their version of it &ldquo;Foobar Linux&rdquo;, it's "
@@ -2240,7 +2278,7 @@
 "Linux&rdquo;, bisogna correggere il loro errore e chiamarla &ldquo;Qualcosa "
 "GNU/Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be more effective to ask companies such as Mandrake, Red Hat and "
 "IBM to call their distributions &ldquo;GNU/Linux&rdquo; rather than asking "
@@ -2252,7 +2290,7 @@
 "ai singoli utenti? <span class=\"anchor-reference-id\">(<a href=\"#companies"
 "\">#companies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It isn't a choice of one or the other&mdash;we ask companies and "
 "organizations and individuals to help spread the word about this.  In fact, "
@@ -2272,7 +2310,7 @@
 "Linux&rsquo;&rdquo;. In altre parole, all'azienda non importava nulla di "
 "quale forma fosse corretta."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We can't make them do this right, but we're not the sort to give up just "
 "because the road isn't easy.  You may not have as much influence at your "
@@ -2286,7 +2324,7 @@
 "cambiare la situazione in modo che le aziende guadagnino di più chiamandolo "
 "&ldquo;GNU/Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to reserve the name &ldquo;GNU/Linux&rdquo; for "
 "distributions that are purely free software? After all, that is the ideal of "
@@ -2298,15 +2336,35 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#reserve\">#reserve</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+# | The widespread practice of adding non[---]free software to the GNU/Linux
+# | system is a major problem for our community.  It teaches the users that
+# | non[---]free software is ok, and that using it is part of the spirit of
+# | &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of
+# | their mission to help users use non[---]free add-ons, and may even invite
+# | salesmen to come and make sales pitches for them.  They adopt goals such
+# | as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them
+# | use non[---]free applications and drivers), or making the system more
+# | popular even at the cost of freedom.
+#, fuzzy
+#| msgid ""
+#| "The widespread practice of adding non-free software to the GNU/Linux "
+#| "system is a major problem for our community.  It teaches the users that "
+#| "non-free software is ok, and that using it is part of the spirit of "
+#| "&ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part "
+#| "of their mission to help users use non-free add-ons, and may even invite "
+#| "salesmen to come and make sales pitches for them.  They adopt goals such "
+#| "as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them "
+#| "use non-free applications and drivers), or making the system more popular "
+#| "even at the cost of freedom."
 msgid ""
-"The widespread practice of adding non-free software to the GNU/Linux system "
-"is a major problem for our community.  It teaches the users that non-free "
+"The widespread practice of adding nonfree software to the GNU/Linux system "
+"is a major problem for our community.  It teaches the users that nonfree "
 "software is ok, and that using it is part of the spirit of &ldquo;"
 "Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of their "
-"mission to help users use non-free add-ons, and may even invite salesmen to "
+"mission to help users use nonfree add-ons, and may even invite salesmen to "
 "come and make sales pitches for them.  They adopt goals such as &ldquo;"
-"helping the users&rdquo; of GNU/Linux (including helping them use non-free "
+"helping the users&rdquo; of GNU/Linux (including helping them use nonfree "
 "applications and drivers), or making the system more popular even at the "
 "cost of freedom."
 msgstr ""
@@ -2320,11 +2378,11 @@
 "aiutare gli utenti&rdquo; di GNU/Linux (aiutarli ad usare applicazioni e "
 "driver non liberi) o di popolarizzare il sistema a discapito della libertà."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The question is how to try to change this."
 msgstr "La domanda è come provare a cambiare questi atteggiamenti."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Given that most of the community which uses GNU with Linux already does not "
 "realize that's what it is, for us to disown these adulterated versions, "
@@ -2338,13 +2396,29 @@
 "conoscenza del fatto che i loro sistemi fossero basati su GNU, non "
 "comprendendo il nostro messaggio."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The way to lead these users to see a connection with freedom is exactly
+# | the opposite: to inform them that all these system versions <em>are</em>
+# | versions of GNU, that they all are based on a system that exists
+# | specifically for the sake of the users' freedom.  With this understanding,
+# | they can start to recognize the distributions that include non[---]free
+# | software as perverted, adulterated versions of GNU, instead of thinking
+# | they are proper and appropriate &ldquo;versions of Linux&rdquo;.
+#, fuzzy
+#| msgid ""
+#| "The way to lead these users to see a connection with freedom is exactly "
+#| "the opposite: to inform them that all these system versions <em>are</em> "
+#| "versions of GNU, that they all are based on a system that exists "
+#| "specifically for the sake of the users' freedom.  With this "
+#| "understanding, they can start to recognize the distributions that include "
+#| "non-free software as perverted, adulterated versions of GNU, instead of "
+#| "thinking they are proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgid ""
 "The way to lead these users to see a connection with freedom is exactly the "
 "opposite: to inform them that all these system versions <em>are</em> "
 "versions of GNU, that they all are based on a system that exists "
 "specifically for the sake of the users' freedom.  With this understanding, "
-"they can start to recognize the distributions that include non-free software "
+"they can start to recognize the distributions that include nonfree software "
 "as perverted, adulterated versions of GNU, instead of thinking they are "
 "proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgstr ""
@@ -2356,7 +2430,7 @@
 "non libero come versioni adulterate di GNU, invece che come versioni "
 "appropriate di &ldquo;Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is very useful to start GNU/Linux User Groups, which call the system GNU/"
 "Linux and adopt the ideals of the GNU Project as a basis for their "
@@ -2374,7 +2448,7 @@
 "concentra sui punti più superficiali ha diritto ad esprimere la propria "
 "opinione, ma non lasciatevi trascinare da loro!"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not make a GNU distribution of Linux (sic) and call that GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
@@ -2384,7 +2458,7 @@
 "Linux? <span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "All the &ldquo;Linux&rdquo; distributions are actually versions of the GNU "
 "system with Linux as the kernel.  The purpose of the term &ldquo;GNU/"
@@ -2398,7 +2472,7 @@
 "distribuzione e chiamare solo quella &ldquo;GNU/Linux&rdquo; oscurerebbe il "
 "punto che noi vogliamo invece evidenziare."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "As for developing a distribution of GNU/Linux, we already did this once, "
 "when we funded the early development of Debian GNU/Linux.  To do it again "
@@ -2412,7 +2486,7 @@
 "impegno ed a meno che la nuova distribuzione non porti vantaggi rispetto a "
 "quelle esistenti, sarebbe del tutto inutile."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Instead we help the developers of 100% free GNU/Linux distributions, such as "
 "gNewSense and Ututo."
@@ -2420,7 +2494,7 @@
 "Quello che facciamo è invece supportare gli sviluppatori delle distribuzioni 
"
 "GNU/Linux libere al 100%, come gNewSense ed Ututo."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not just say &ldquo;Linux is the GNU kernel&rdquo; and release some "
 "existing version of GNU/Linux under the name &ldquo;GNU&rdquo;? <span class="
@@ -2430,7 +2504,7 @@
 "versione esistente di GNU/Linux con il nome &ldquo;GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#linuxgnu\">#linuxgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It might have been a good idea to adopt Linux as the GNU kernel back in "
 "1992.  If we had realized, then, how long it would take to get the GNU Hurd "
@@ -2441,7 +2515,7 @@
 "una versione funzionante di GNU Hurd, lo avremmo fatto senz'altro (è facile "
 "parlare con il senno di poi)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we were to take an existing version of GNU/Linux and relabel it as &ldquo;"
 "GNU&rdquo;, that would be somewhat like making a version of the GNU system "
@@ -2453,7 +2527,7 @@
 "chiamarla &ldquo;Linux&rdquo;. Non è giusto e non è così che vogliamo "
 "comportarci."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Did the GNU Project condemn and oppose use of Linux in the early days? <span "
 "class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
@@ -2462,7 +2536,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We did not adopt Linux as our kernel, but we didn't condemn or oppose it.  "
 "In 1993 we started discussing the arrangements to sponsor the development of "
@@ -2482,7 +2556,7 @@
 "spesso specialistici e non portabili; bisognava ripulirli prima "
 "dell'installazione."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who had made the changes showed little interest in cooperating "
 "with us.  One of them actually told us that he didn't care about working "
@@ -2501,7 +2575,7 @@
 "GNU, si rivelò essere il primo (e finora l'unico) a rifiutarsi di lavorare "
 "con noi."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It was this experience that first showed us that people were calling a "
 "version of the GNU system &ldquo;Linux&rdquo;, and that this confusion was "
@@ -2515,7 +2589,7 @@
 "sistema &ldquo;GNU/Linux&rdquo; è la nostra risposta a quel problema, e ad "
 "altri problemi causati dal termine improprio &ldquo;Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why did you wait so long before asking people to use the name GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
@@ -2524,7 +2598,7 @@
 "nome GNU/Linux? <span class=\"anchor-reference-id\">(<a href=\"#wait"
 "\">#wait</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually we didn't.  We began talking privately with developers and "
 "distributors about this in 1994, and made a more public campaign in 1996.  "
@@ -2534,7 +2608,7 @@
 "sviluppatori e distributori di questo problema nel 1994, ed intraprendemmo "
 "una campagna più pubblica nel 1996. Continueremo finché sarà necessario."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should the GNU/<i>name</i> convention be applied to all programs that are "
 "GPL'ed? <span class=\"anchor-reference-id\">(<a href=\"#allgpled"
@@ -2544,7 +2618,7 @@
 "rilasciati sotto licenza GPL? <span class=\"anchor-reference-id\">(<a href="
 "\"#allgpled\">#allgpled</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We never refer to individual programs as &ldquo;GNU/<i>name</i>&rdquo;.  "
 "When a program is a GNU package, we may call it &ldquo;GNU <i>name</"
@@ -2554,7 +2628,7 @@
 "<i>nome</i>&rdquo;. Quando un programma è parte di GNU, potremmo chiamarlo "
 "&ldquo;GNU <i>nome</i>&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU, the operating system, is made up of many different programs.  Some of "
 "the programs in GNU were written as part of the GNU Project or specifically "
@@ -2565,7 +2639,7 @@
 "sono stati scritti come parte del Progetto GNU o ad esso contribuiti; questi "
 "sono componenti di GNU, e spesso usiamo &ldquo;GNU&rdquo; nei loro nomi."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It's up to the developers of a program to decide if they want to contribute "
 "it and make it a GNU package.  If you have developed a program and you would "
@@ -2578,7 +2652,7 @@
 "scrivete (in inglese, se possibile) a <a href=\"mailto:gnu@gnu.org\";>&lt;"
 "gnu@gnu.org&gt;</a> e ne valuteremo l'inclusione."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It wouldn't be fair to put the name GNU on every individual program that is "
 "released under the GPL.  If you write a program and release it under the "
@@ -2598,7 +2672,7 @@
 "può riceverne il merito, ed inserire il nome &ldquo;GNU&rdquo; nel suo "
 "sarebbe improprio."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In contrast, we do deserve the overall credit for the GNU operating system "
 "as a whole, even though not for each and every program in it.  The system "
@@ -2610,7 +2684,7 @@
 "esiste come tale grazie alla nostra determinazione e persistenza dal 1984, "
 "molti anni prima della genesi di Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The operating system in which Linux became popular was basically the same as "
 "the GNU operating system.  It was not entirely the same, because it had a "
@@ -2622,7 +2696,7 @@
 "differente, ma uguale per il resto. Era una variante di GNU. Era il sistema "
 "GNU/Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux continues to be used primarily in derivatives of that system&mdash;in "
 "today's versions of the GNU/Linux system.  What gives these systems their "
@@ -2633,7 +2707,7 @@
 "le attuali distribuzioni GNU/Linux. Quello che fornisce a questi sistemi la "
 "propria identità è il loro nucleo formato da GNU e Linux, non Linux da 
solo."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since much of GNU comes from Unix, shouldn't GNU give credit to Unix by "
 "using &ldquo;Unix&rdquo; in its name? <span class=\"anchor-reference-id\">"
@@ -2643,7 +2717,7 @@
 "del suo nome? <span class=\"anchor-reference-id\">(<a href=\"#unix\">#unix</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Actually, none of GNU comes from Unix.  Unix was proprietary software (and "
 "still is), so using any of its code in GNU would have been illegal.  This is "
@@ -2660,7 +2734,7 @@
 "programmi, nemmeno dei piccoli frammenti; tutto doveva essere scritto da "
 "capo."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "No code in GNU comes from Unix, but GNU is a Unix-compatible system; "
 "therefore, many of the ideas and specifications of GNU do come from Unix.  "
@@ -2675,13 +2749,29 @@
 "goliardica per dare credito ad Unix per l'eredità lasciataci, nella "
 "tradizione degli acronimi ricorsivi iniziata negli anni 70."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.
+# |  The author of TINT wrote another implementation of TECO (there were
+# | already many of them, for various systems), but instead of calling it by a
+# | dull name like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of
+# | a clever amusing name.  (That's what hacking means: <a
+# | href=\"http{+s+}://stallman.org/articles/on-hacking.html\">playful
+# | cleverness</a>.)
+#, fuzzy
+#| msgid ""
+#| "The first such recursive acronym was TINT, &ldquo;TINT Is Not "
+#| "TECO&rdquo;.  The author of TINT wrote another implementation of TECO "
+#| "(there were already many of them, for various systems), but instead of "
+#| "calling it by a dull name like &ldquo;<em>somethingorother</em> "
+#| "TECO&rdquo;, he thought of a clever amusing name.  (That's what hacking "
+#| "means: <a href=\"http://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
 "The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
 "The author of TINT wrote another implementation of TECO (there were already "
 "many of them, for various systems), but instead of calling it by a dull name "
 "like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of a clever "
-"amusing name.  (That's what hacking means: <a href=\"http://stallman.org/";
+"amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
 "Il primo di questi acronimi è stato TINT, &ldquo;TINT Is Not TECO&rdquo; "
@@ -2692,7 +2782,7 @@
 "questo: <a href=\"http://stallman.org/articles/on-hacking.html\";>ingegnosità 
"
 "scherzosa</a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Other hackers enjoyed that name so much that we imitated the approach.  It "
 "became a tradition that, when you were writing from scratch a program that "
@@ -2707,7 +2797,7 @@
 "&ldquo;MINK non è Klever&rdquo;. Nello stesso spirito, decidemmo di chiamare 
"
 "il nostro sostituto per Unix &ldquo;GNU's Not Unix&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Historically, AT&amp;T which developed Unix did not want anyone to give it "
 "credit by using &ldquo;Unix&rdquo; in the name of a similar system, not even "
@@ -2723,7 +2813,7 @@
 "lo stesso Unix) hanno un nome completamente diverso non comprensivo della "
 "parola &ldquo;Unix&rdquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we say &ldquo;GNU/BSD&rdquo; too? <span class=\"anchor-reference-id\">"
 "(<a href=\"#bsd\">#bsd</a>)</span>"
@@ -2731,7 +2821,7 @@
 "Dovremmo allora dire anche &ldquo;GNU/BSD&rdquo;? <span class=\"anchor-"
 "reference-id\">(<a href=\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems, "
 "because that term does not fit the history of the BSD systems."
@@ -2739,9 +2829,19 @@
 "Non chiamiamo i sistemi BSD (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; in quanto "
 "questi hanno radici storiche diverse."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The BSD system was developed by UC Berkeley as non[---]free software in
+# | the 80s, and became free in the early 90s.  A free operating system that
+# | exists today is almost certainly either a variant of the GNU system, or a
+# | kind of BSD system.
+#, fuzzy
+#| msgid ""
+#| "The BSD system was developed by UC Berkeley as non-free software in the "
+#| "80s, and became free in the early 90s.  A free operating system that "
+#| "exists today is almost certainly either a variant of the GNU system, or a "
+#| "kind of BSD system."
 msgid ""
-"The BSD system was developed by UC Berkeley as non-free software in the 80s, "
+"The BSD system was developed by UC Berkeley as nonfree software in the 80s, "
 "and became free in the early 90s.  A free operating system that exists today "
 "is almost certainly either a variant of the GNU system, or a kind of BSD "
 "system."
@@ -2750,7 +2850,7 @@
 "anni 80 e fu liberato nei primi anni 90. Un sistema libero al giorno d'oggi "
 "è quasi certamente una variante di GNU o di BSD."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "People sometimes ask whether BSD too is a variant of GNU, as GNU/Linux is.  "
 "It is not.  The BSD developers were inspired to make their code free "
@@ -2763,7 +2863,7 @@
 "Progetto GNU e da appelli specifici da attivisti che sono riusciti a "
 "convincerli ma il loro codice ha ben poco in comune con quello di GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "BSD systems today use some GNU packages, just as the GNU system and its "
 "variants use some BSD programs; however, taken as wholes, they are two "
@@ -2778,7 +2878,7 @@
 "al sistema GNU, motivo per il quale un nome come GNU/BSD non sarebbe "
 "appropriato."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The connection between GNU/Linux and GNU is much closer, and that's why the "
 "name &ldquo;GNU/Linux&rdquo; is appropriate for it."
@@ -2786,7 +2886,7 @@
 "Il rapporto tra GNU/Linux e GNU è più diretto, motivo per il quale il nome "
 "&ldquo;GNU/Linux&rdquo; è per esso appropriato."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is a version of GNU which uses the kernel from NetBSD.  Its developers "
 "call it &ldquo;Debian GNU/NetBSD&rdquo;, but &ldquo;GNU/"
@@ -2800,7 +2900,7 @@
 "sistema e non solo un kernel. Questo non è un sistema BSD, visto che il "
 "sistema è quasi identico ad un sistema GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "If I install the GNU tools on Windows, does that mean I am running a GNU/"
 "Windows system? <span class=\"anchor-reference-id\">(<a href=\"#othersys"
@@ -2810,7 +2910,7 @@
 "un sistema GNU/Windows? <span class=\"anchor-reference-id\">(<a href="
 "\"#othersys\">#othersys</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
 "GNU are just a part of the GNU software, which is just a part of the GNU "
@@ -2824,7 +2924,7 @@
 "altro sistema operativo completo che non condivide codice con GNU. Tutto "
 "considerato, è una situazione molto diversa da quella di GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can't Linux be used without GNU? <span class=\"anchor-reference-id\">(<a "
 "href=\"#justlinux\">#justlinux</a>)</span>"
@@ -2832,7 +2932,7 @@
 "Non può Linux essere usato senza GNU? <span class=\"anchor-reference-id\">"
 "(<a href=\"#justlinux\">#justlinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is used by itself, or with small other programs, in some appliances.  "
 "These small software systems are a far cry from the GNU/Linux system.  Users "
@@ -2847,7 +2947,7 @@
 "esclusivamente Linux è utile alla nostra causa in quanto permetterebbe alla "
 "gente di capire meglio i vantaggi di un'installazione GNU/Linux completa."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How much of the GNU system is needed for the system to be GNU/Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
@@ -2856,7 +2956,7 @@
 "chiamare GNU/Linux? <span class=\"anchor-reference-id\">(<a href=\"#howmuch"
 "\">#howmuch</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "&ldquo;How much&rdquo; is not a meaningful question because the GNU system "
 "does not have precise boundaries."
@@ -2864,7 +2964,7 @@
 "&ldquo;Quanto&rdquo; non è una domanda sensata, perché il sistema GNU non 
ha "
 "confini precisi."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is an operating system maintained by a community.  It includes far more "
 "than just the GNU software packages (of which we have a specific list), and "
@@ -2880,7 +2980,7 @@
 "usa un aparte del sistema GNU e non si usa un'altra parte, non c'è un modo "
 "sensato di dire &ldquo;quanto&rdquo; se ne usa."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we look at the level of packages, Linux is one important package in the "
 "GNU/Linux system.  The inclusion of one important GNU package is enough to "
@@ -2890,7 +2990,7 @@
 "GNU/Linux. La presenza di un solo importante pacchetto GNU basta per noi per "
 "chiedere pari visibilità."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Are there complete Linux systems [sic] without GNU? <span class=\"anchor-"
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
@@ -2900,7 +3000,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#linuxsyswithoutgnu"
 "\">#linuxsyswithoutgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There are complete systems that contain Linux and not GNU; Android is an "
 "example.  But it is a mistake to call them &ldquo;Linux&rdquo; systems, just "
@@ -2911,7 +3011,7 @@
 "Linux&rdquo;, per lo stesso motivo per cui sarebbe un errore chiamare un "
 "sistema GNU un sistema &ldquo;Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android is very different from the GNU/Linux system&mdash;because the two "
 "have very little code in common.  In fact, the only thing they have in "
@@ -2921,7 +3021,7 @@
 "poco codice. L'unico componente comune ad entrambi è proprio il kernel di "
 "Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
 "necessary to say things like, &ldquo;Android contains Linux, but it isn't "
@@ -2933,7 +3033,7 @@
 "Android contiene Linux ma non è Linux, dato che non contiene le solite "
 "librerie di Linux [sic, facendo riferimento al sistema GNU].&rdquo;"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android contains just as much of Linux as GNU/Linux does.  What it doesn't "
 "have is the GNU system.  Android replaces that with Google software that "
@@ -2945,7 +3045,7 @@
 "funziona in maniera diversa. Quello che rende Android diverso da GNU/Linux è 
"
 "l'assenza di GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Is it correct to say &ldquo;using Linux&rdquo; if it refers to using GNU/"
 "Linux and using Android? <span class=\"anchor-reference-id\">(<a href="
@@ -2957,7 +3057,7 @@
 "\"#usegnulinuxandandroidlinuxsyswithoutgnu"
 "\">#usegnulinuxandandroidlinuxsyswithoutgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Far from it.  That usage is so strained that people will not understand the "
 "intended meaning."
@@ -2965,7 +3065,7 @@
 "No, è una forzatura così grande che le persone non capiranno nemmeno di 
cosa "
 "si vuole parlare."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public will find it very strange to speak of using Android as &ldquo;"
 "using Linux&rdquo;.  It's like having a conversation, then saying you were "
@@ -2975,7 +3075,7 @@
 "\"usare Linux\": è come parlare con qualcuno e poi dire che si è parlato 
con "
 "l'intestino o con il sistema venoso dell'interlocutore."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public <em>will</em> understand the idea of &ldquo;using Linux&rdquo; "
 "when it's really GNU/Linux, by way of the usual misunderstanding: thinking "
@@ -2985,7 +3085,7 @@
 "dell'uso di GNU/Linux, a causa del comune abuso di linguaggio in cui si "
 "chiama \"Linux\" l'intero sistema."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Use of Android and use of GNU/Linux are totally different, as different as "
 "driving a car and riding a bicycle.  The fact that the first two both "
@@ -3006,7 +3106,7 @@
 "semplicemente di \"usare auto e biciclette\". Allo stesso modo, il modo "
 "chiaro di parlare dell'uso di GNU/Linux è dire \"usare GNU/Linux e 
Android\"."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not call the system &ldquo;Linux&rdquo; anyway, and strengthen Linus "
 "Torvalds' role as posterboy for our community? <span class=\"anchor-"
@@ -3016,7 +3116,7 @@
 "Linus Torvalds come volto della nostra comunità? <span class=\"anchor-"
 "reference-id\">(<a href=\"#helplinus\">#helplinus</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Linus Torvalds is the &ldquo;posterboy&rdquo; (other people's choice of "
 "word, not ours) for his goals, not ours.  His goal is to make the system "
@@ -3034,12 +3134,30 @@
 "come un principio etico, motivo per il quale l'opinione pubblica non associa "
 "il nome &ldquo;Linux&rdquo; a tale principio."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | Linus publicly states his disagreement with the free software movement's
+# | ideals.  He developed non[---]free software in his job for many years (and
+# | said so to a large audience at a &ldquo;Linux&rdquo;World show), and
+# | publicly invited fellow developers of Linux, the kernel, to use
+# | non[---]free software to work on it with him.  He goes even further, and
+# | rebukes people who suggest that engineers and scientists should consider
+# | social consequences of our technical work&mdash;rejecting the lessons
+# | society learned from the development of the atom bomb.
+#, fuzzy
+#| msgid ""
+#| "Linus publicly states his disagreement with the free software movement's "
+#| "ideals.  He developed non-free software in his job for many years (and "
+#| "said so to a large audience at a &ldquo;Linux&rdquo;World show), and "
+#| "publicly invited fellow developers of Linux, the kernel, to use non-free "
+#| "software to work on it with him.  He goes even further, and rebukes "
+#| "people who suggest that engineers and scientists should consider social "
+#| "consequences of our technical work&mdash;rejecting the lessons society "
+#| "learned from the development of the atom bomb."
 msgid ""
 "Linus publicly states his disagreement with the free software movement's "
-"ideals.  He developed non-free software in his job for many years (and said "
+"ideals.  He developed nonfree software in his job for many years (and said "
 "so to a large audience at a &ldquo;Linux&rdquo;World show), and publicly "
-"invited fellow developers of Linux, the kernel, to use non-free software to "
+"invited fellow developers of Linux, the kernel, to use nonfree software to "
 "work on it with him.  He goes even further, and rebukes people who suggest "
 "that engineers and scientists should consider social consequences of our "
 "technical work&mdash;rejecting the lessons society learned from the "
@@ -3055,7 +3173,7 @@
 "tecnico - gettando via la lezione imparata dalla creazione della bomba "
 "atomica."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with writing a free program for the motivations of "
 "learning and having fun; the kernel Linus wrote for those reasons was an "
@@ -3075,7 +3193,7 @@
 "opinioni; è la gente che deve essere informata che il sistema operativo è "
 "stato creato a partire da ideali di libertà e non dalle sue opinioni."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong for us to label Linus Torvalds' work as GNU? <span class="
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
@@ -3084,7 +3202,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong, so we don't do that.  Torvalds' work is Linux, the "
 "kernel; we are careful not to attribute that work to the GNU Project or "
@@ -3096,7 +3214,7 @@
 "o a chiamarlo &ldquo;GNU&rdquo;. Quando parliamo dell'intero sistema, &ldquo;"
 "GNU/Linux&rdquo; dà a Linus parte del merito."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Does Linus Torvalds agree that Linux is just the kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
@@ -3105,10 +3223,23 @@
 "class=\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | He recognized this at the beginning.  The earliest Linux release notes
+# | said, <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | &ldquo;Most of the tools used with linux are GNU software and are under
+# | the GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
+# |  for more info&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
+#| "versions/RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are "
+#| "GNU software and are under the GNU copyleft. These tools aren't in the "
+#| "distribution - ask me (or GNU)  for more info&rdquo;</a>."
 msgid ""
 "He recognized this at the beginning.  The earliest Linux release notes said, "
-"<a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"<a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
 "RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are GNU software "
 "and are under the GNU copyleft. These tools aren't in the distribution - ask "
 "me (or GNU)  for more info&rdquo;</a>."
@@ -3120,7 +3251,7 @@
 "non fanno parte della distribuzione - contattate me (o GNU) per ulteriori "
 "informazioni&rdquo;</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not finish the GNU Hurd kernel, release the GNU system as a whole, and "
 "forget the question of what to call GNU/Linux? <span class=\"anchor-"
@@ -3130,7 +3261,7 @@
 "intero e lasciar perdere la questione di GNU/Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#finishhurd\">#finishhurd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We would like credit for the GNU operating system no matter which kernel is "
 "used with it."
@@ -3138,13 +3269,27 @@
 "Vorremmo ricevere credito per l'intero sistema operativo GNU, "
 "indipendentemente dal kernel ad esso associato."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | Making the GNU Hurd work well enough to compete with Linux would be a big
+# | job, and it's not clearly necessary.  The only thing ethically wrong with
+# | Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the
+# | best fix for that problem is <a
+# | [-href=\"http://fsf.org/campaigns/priority-projects\";>-]
+# | {+href=\"https://www.fsf.org/campaigns/priority-projects\";>+} developing
+# | free replacement for the blobs</a>.
+#, fuzzy
+#| msgid ""
+#| "Making the GNU Hurd work well enough to compete with Linux would be a big "
+#| "job, and it's not clearly necessary.  The only thing ethically wrong with "
+#| "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the "
+#| "best fix for that problem is <a href=\"http://fsf.org/campaigns/priority-";
+#| "projects\"> developing free replacement for the blobs</a>."
 msgid ""
 "Making the GNU Hurd work well enough to compete with Linux would be a big "
 "job, and it's not clearly necessary.  The only thing ethically wrong with "
 "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the best "
-"fix for that problem is <a href=\"http://fsf.org/campaigns/priority-projects";
-"\"> developing free replacement for the blobs</a>."
+"fix for that problem is <a href=\"https://www.fsf.org/campaigns/priority-";
+"projects\"> developing free replacement for the blobs</a>."
 msgstr ""
 "Rendere GNU Hurd funzionale allo stesso livello di Linux sarebbe un lavoro "
 "enorme e non del tutto necessario. L'unico aspetto eticamente sbagliato di "
@@ -3152,7 +3297,7 @@
 "migliore per questo problema è la <a href=\"http://fsf.org/campaigns/";
 "priority-projects\">loro sostituzione con alternative libere</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The battle is already lost&mdash;society has made its decision and we can't "
 "change it, so why even think about it? <span class=\"anchor-reference-id\">"
@@ -3162,7 +3307,7 @@
 "possiamo cambiarla, perché perdere tempo a pensarci? <span class=\"anchor-"
 "reference-id\">(<a href=\"#lost\">#lost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This isn't a battle, it is a campaign of education.  What to call the system "
 "is not a single decision, to be made at one moment by &ldquo;society&rdquo;: "
@@ -3178,7 +3323,7 @@
 "costringere gli altri a dire &ldquo;GNU/Linux&rdquo;, quello che potete fare "
 "è chiamare il sistema &ldquo;GNU/Linux&rdquo;, facendo da esempio agli 
altri."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Society has made its decision and we can't change it, so what good does it "
 "do if I say &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id\">(<a "
@@ -3188,7 +3333,7 @@
 "anche se dicessi &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id"
 "\">(<a href=\"#whatgood\">#whatgood</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is not an all-or-nothing situation: correct and incorrect pictures are "
 "being spread more or less by various people.  If you call the system &ldquo;"
@@ -3208,7 +3353,7 @@
 "avreste già educato un sostanziale numero di persone con poco sforzo, alcune 
"
 "delle quali diffonderanno la correzione ad altri."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to call the system &ldquo;Linux&rdquo; and teach "
 "people its real origin with a ten-minute explanation? <span class=\"anchor-"
@@ -3218,7 +3363,7 @@
 "gente le sue vere origini con una presentazione da dieci minuti? <span class="
 "\"anchor-reference-id\">(<a href=\"#explain\">#explain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "If you help us by explaining to others in that way, we appreciate your "
 "effort, but that is not the best method.  It is not as effective as calling "
@@ -3228,7 +3373,7 @@
 "sforzi ma temo non sia il metodo migliore. Non è efficace come chiamare il "
 "sistema &ldquo;GNU/Linux&rdquo; e costituisce uno spreco di tempo."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is ineffective because it may not sink in, and surely will not "
 "propagate.  Some of the people who hear your explanation will pay attention, "
@@ -3243,7 +3388,7 @@
 "dubito la ripeterebbero ad altri. Finirebbero per chiamarlo &ldquo;"
 "Linux&rdquo; e quindi per diffondere informazioni erronee."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is inefficient because it takes a lot more time.  Saying and writing "
 "&ldquo;GNU/Linux&rdquo; will take you only a few seconds a day, not minutes, "
@@ -3257,7 +3402,7 @@
 "GNU/Linux quando scrivete e parlate è senz'altro la maniera più facile per "
 "aiutare il Progetto GNU in maniera efficace."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people laugh at you when you ask them to call the system GNU/Linux.  "
 "Why do you subject yourself to this treatment? <span class=\"anchor-"
@@ -3267,7 +3412,7 @@
 "sistema GNU/Linux. Perché trovarsi in questa situazione? <span class="
 "\"anchor-reference-id\">(<a href=\"#treatment\">#treatment</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; tends to give people a mistaken "
 "picture of the system's history and reason for existence.  People who laugh "
@@ -3282,7 +3427,7 @@
 "chiediamo che il nostro lavoro venga riconosciuto. Se sapessero la verità, "
 "non credo riderebbero."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Why do we take the risk of making a request that sometimes leads people to "
 "ridicule us? Because often it has useful results that help the GNU Project.  "
@@ -3292,7 +3437,7 @@
 "allo scherno della gente? Perché spesso ha risultati utili che aiutano il "
 "Progetto GNU. È un rischio che vale la pena correre."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you see such an ironically unfair situation occurring, please don't sit "
 "idly by.  Please teach the laughing people the real history.  When they see "
@@ -3303,7 +3448,7 @@
 "che ridono. Coloro che hanno un po' di buon senso capiranno e smetteranno di "
 "ridere."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people condemn you when you ask them to call the system GNU/Linux.  "
 "Don't you lose by alienating them? <span class=\"anchor-reference-id\">(<a "
@@ -3314,7 +3459,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#alienate\">#alienate</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not much.  People who don't appreciate our role in developing the system are "
 "unlikely to make substantial efforts to help us.  If they do work that "
@@ -3331,7 +3476,7 @@
 "lavoro a qualcun altro, stanno indebolendo la nostra abilità di reclutare "
 "nuovi collaboratori."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It makes no sense to worry about alienating people who are already mostly "
 "uncooperative, and it is self-defeating to be deterred from correcting a "
@@ -3343,7 +3488,7 @@
 "che ne sono causa. Conseguentemente, continueremo a correggere il termine "
 "improprio."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Whatever you contributed, is it legitimate to rename the operating system? "
 "<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
@@ -3352,7 +3497,7 @@
 "rinominare l'intero sistema operativo? <span class=\"anchor-reference-id\">"
 "(<a href=\"#rename\">#rename</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are not renaming anything; we have been calling this system &ldquo;"
 "GNU&rdquo; ever since we announced it in 1983.  The people who tried to "
@@ -3362,7 +3507,7 @@
 "quando lo abbiamo annunciato, nel 1983.  È la gente che ha provato a "
 "rinominarlo come &ldquo;Linux&rdquo; che avrebbe dovuto evitare di farlo."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong to force people to call the system &ldquo;GNU/Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
@@ -3371,7 +3516,7 @@
 "Linux&rdquo;? <span class=\"anchor-reference-id\">(<a href=\"#force"
 "\">#force</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong to force them, and we don't try.  We call the system "
 "&ldquo;GNU/Linux&rdquo;, and we ask you to do it too."
@@ -3380,7 +3525,7 @@
 "il sistema &ldquo;GNU/Linux&rdquo; e non facciamo altro che chiedervi di "
 "fare lo stesso."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not sue people who call the whole system &ldquo;Linux&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
@@ -3389,7 +3534,7 @@
 "Linux&rdquo;? <span class=\"anchor-reference-id\">(<a href=\"#whynotsue"
 "\">#whynotsue</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are no legal grounds to sue them, but since we believe in freedom of "
 "speech, we wouldn't want to do that anyway.  We ask people to call the "
@@ -3400,7 +3545,7 @@
 "alla gente di chiamare il sistema &ldquo;GNU/Linux&rdquo; perché è la cosa "
 "giusta."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Shouldn't you put something in the GNU GPL to require people to call the "
 "system &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id\">(<a href="
@@ -3410,13 +3555,31 @@
 "gente di chiamare il sistema &ldquo;GNU&rdquo;? <span class=\"anchor-"
 "reference-id\">(<a href=\"#require\">#require</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
+# | The purpose of the GNU GPL is to protect the users' freedom from those who
+# | would make proprietary versions of free software.  While it is true that
+# | those who call the system &ldquo;Linux&rdquo; often do things that limit
+# | the users' freedom, such as bundling non[---]free software with the
+# | GNU/Linux system or even developing non[---]free software for such use,
+# | the mere act of calling the system &ldquo;Linux&rdquo; does not, in
+# | itself, deny users their freedom.  It seems improper to make the GPL
+# | restrict what name people can use for the system.
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU GPL is to protect the users' freedom from those "
+#| "who would make proprietary versions of free software.  While it is true "
+#| "that those who call the system &ldquo;Linux&rdquo; often do things that "
+#| "limit the users' freedom, such as bundling non-free software with the GNU/"
+#| "Linux system or even developing non-free software for such use, the mere "
+#| "act of calling the system &ldquo;Linux&rdquo; does not, in itself, deny "
+#| "users their freedom.  It seems improper to make the GPL restrict what "
+#| "name people can use for the system."
 msgid ""
 "The purpose of the GNU GPL is to protect the users' freedom from those who "
 "would make proprietary versions of free software.  While it is true that "
 "those who call the system &ldquo;Linux&rdquo; often do things that limit the "
-"users' freedom, such as bundling non-free software with the GNU/Linux system "
-"or even developing non-free software for such use, the mere act of calling "
+"users' freedom, such as bundling nonfree software with the GNU/Linux system "
+"or even developing nonfree software for such use, the mere act of calling "
 "the system &ldquo;Linux&rdquo; does not, in itself, deny users their "
 "freedom.  It seems improper to make the GPL restrict what name people can "
 "use for the system."
@@ -3431,7 +3594,7 @@
 "degli utenti. Ci è sembrato poco appropriato sfruttare la GPL per imporre "
 "limitazioni sul nome usato dagli utenti per il sistema."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you objected to the original BSD license's advertising requirement to "
 "give credit to the University of California, isn't it hypocritical to demand "
@@ -3443,7 +3606,7 @@
 "ipocrita chiedere credito per il progetto GNU? <span class=\"anchor-"
 "reference-id\">(<a href=\"#BSDlicense\">#BSDlicense</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would be hypocritical to make the name GNU/Linux a license requirement, "
 "and we don't.  We only <em>ask</em> you to give us the credit we deserve."
@@ -3452,7 +3615,7 @@
 "licenza e quindi non lo facciamo. Noi <em>chiediamo</em> di ricevere il "
 "riconoscimento che ci spetta."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please note that there are at least <a href=\"/licenses/bsd.html\"> two "
 "different BSD licenses</a>.  For clarity's sake, please don't use the term "
@@ -3463,7 +3626,7 @@
 "equivoci, vi invito a non usare il termine &ldquo;licenza BSD&rdquo; senza "
 "specificare quale."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you failed to put something in the GNU GPL to require people to call "
 "the system &ldquo;GNU&rdquo;, you deserve what happened; why are you "
@@ -3475,7 +3638,7 @@
 "volete? <span class=\"anchor-reference-id\">(<a href=\"#deserve\">#deserve</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The question presupposes a rather controversial general ethical premise: "
 "that if people do not force you to treat them fairly, you are entitled to "
@@ -3487,11 +3650,11 @@
 "diritto a sfruttarla a vostro piacimento. In altre parole, presuppone che il "
 "vincitore abbia sempre ragione."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope you disagree with that premise just as we do."
 msgstr "Speriamo che voi, come noi, troviate questa premessa spiacevole."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't you be better off not contradicting what so many people believe? "
 "<span class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)"
@@ -3501,7 +3664,7 @@
 "crede? <span class=\"anchor-reference-id\">(<a href=\"#contradict"
 "\">#contradict</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't think we should go along with large numbers of people because they "
 "have been misled.  We hope you too will decide that truth is important."
@@ -3510,7 +3673,7 @@
 "queste hanno le idee confuse. Speriamo che anche voi decidiate che la verità 
"
 "è quella che conta."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We could never have developed a free operating system without first denying "
 "the belief, held by most people, that proprietary software was legitimate "
@@ -3520,7 +3683,7 @@
 "negare l'errata convinzione, condivisa dalla maggior parte della gente, che "
 "il software proprietario fosse legittimo ed accettabile."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
 "<span class=\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</"
@@ -3530,11 +3693,11 @@
 "perché sia il nome giusto? <span class=\"anchor-reference-id\">(<a href="
 "\"#somanyright\">#somanyright</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "We don't think that the popularity of an error makes it the truth."
 msgstr "Non crediamo che la popolarità di un errore lo renda la verità."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it better to call the system by the name most users already know? "
 "<span class=\"anchor-reference-id\">(<a href=\"#knownname\">#knownname</a>)</"
@@ -3544,7 +3707,7 @@
 "maggior parte dei suoi utenti già conosce? <span class=\"anchor-reference-id"
 "\">(<a href=\"#knownname\">#knownname</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo; includes "
 "&ldquo;Linux&rdquo;, they will recognize what you're talking about.  If you "
@@ -3556,7 +3719,7 @@
 "&ldquo;(erroneamente noto come &lsquo;Linux&rsquo;)&rdquo; ogni tanto, non "
 "ci saranno equivoci."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many people care about what's convenient or who's winning, not about "
 "arguments of right or wrong.  Couldn't you get more of their support by a "
@@ -3568,12 +3731,24 @@
 "loro? <span class=\"anchor-reference-id\">(<a href=\"#winning\">#winning</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+# | To care only about what's convenient or who's winning is an amoral
+# | approach to life.  Non[---]free software is an example of that amoral
+# | approach and thrives on it.  Thus, in the long run it would be
+# | self-defeating for us to adopt that approach.  We will continue talking in
+# | terms of right and wrong.
+#, fuzzy
+#| msgid ""
+#| "To care only about what's convenient or who's winning is an amoral "
+#| "approach to life.  Non-free software is an example of that amoral "
+#| "approach and thrives on it.  Thus, in the long run it would be self-"
+#| "defeating for us to adopt that approach.  We will continue talking in "
+#| "terms of right and wrong."
 msgid ""
 "To care only about what's convenient or who's winning is an amoral approach "
-"to life.  Non-free software is an example of that amoral approach and "
-"thrives on it.  Thus, in the long run it would be self-defeating for us to "
-"adopt that approach.  We will continue talking in terms of right and wrong."
+"to life.  Nonfree software is an example of that amoral approach and thrives "
+"on it.  Thus, in the long run it would be self-defeating for us to adopt "
+"that approach.  We will continue talking in terms of right and wrong."
 msgstr ""
 "Preoccuparsi solo di ciò che è conveniente o solo di ciò che è vincente 
è un "
 "approccio amorale alla vita. Il software non libero è un esempio di "
@@ -3582,7 +3757,7 @@
 "sconfitta per la nostra causa. Continueremo perciò a parlare in termini di "
 "giusto e sbagliato."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope that you are one of those for whom right and wrong do matter."
 msgstr ""
 "Speriamo che voi siate tra coloro per cui giusto e sbagliato contano ancora "
@@ -3641,19 +3816,18 @@
 "traduzioni</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2001, [-2006, 2007, 2008,-] {+2006-2008,+} 2010, 2011,
-# | 2013, [-2014, 2015, 2016, 2017, 2018-] {+2014-2018, 2020, 2021+} Free
-# | Software Foundation, Inc.
+# | Copyright &copy; [-2014, 2015, 2016, 2017, 2018, 2019-] {+2001-2011,
+# | 2013-2018, 2020, 2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
-#| "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, "
-#| "2016, 2017, 2018 Free Software Foundation, Inc."
+#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation, "
+"Inc."
 msgstr ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, 2016, "
-"2017, 2018 Free Software Foundation, Inc."
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+"Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -3678,6 +3852,17 @@
 msgid "Updated:"
 msgstr "Ultimo aggiornamento:"
 
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, "
+#~| "2016, 2017, 2018 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
+#~ "Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, "
+#~ "2016, 2017, 2018 Free Software Foundation, Inc."
+
 #~ msgid "GNU/Linux FAQ by Richard Stallman"
 #~ msgstr "Domande ricorrenti su GNU/Linux, di Richard Stallman"
 

Index: gnu/po/gnu-linux-faq.ja.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ja.po,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- gnu/po/gnu-linux-faq.ja.po  1 Jul 2021 02:03:47 -0000       1.95
+++ gnu/po/gnu-linux-faq.ja.po  30 Aug 2021 13:34:53 -0000      1.96
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2020-05-31 10:58+0900\n"
 "Last-Translator: NIIBE Yutaka <gniibe@fsij.org>\n"
 "Language-Team: Japanese <web-translators-ja@gnu.org>\n"
@@ -15,33 +15,21 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 
 #. type: Content of: <title>
 msgid "GNU/Linux FAQ - GNU Project - Free Software Foundation"
 msgstr "GNU/Linux FAQ - GNUプロジェクト - 
フリーソフトウェアファウンデーション"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU/Linux FAQ"
 msgstr "GNU/Linux FAQ"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by Richard Stallman"
 msgstr "リチャード・ストールマン著"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
-"linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a href=\"/"
-"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"この問題についてもっと学ぶには、わたしたちのページの<a
 href=\"/gnu/linux-and-"
-"gnu.html\">LinuxとGNUプロジェクト</a>について、<a 
href=\"/gnu/why-gnu-linux."
-"html\">なぜGNU/Linux?</a>、<a 
href=\"/gnu/gnu-users-never-heard-of-gnu.html"
-"\">GNUについてなにも聞いたことがないGNUユーザ</a>をご覧くã
 ã•ã„。"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When people see that we use and recommend the name GNU/Linux for a system "
 "that many others call just &ldquo;Linux&rdquo;, they ask many questions.  "
@@ -51,6 +39,10 @@
 
"Linuxという名前を用いて、また推奨するのを見るとき、人ã€
…は多くの疑問を持ちま"
 
"す。ここではよくある質問とわたしたちの答えを示します。"
 
+#. type: Content of: <div><div><h3>
+msgid "Table of Contents"
+msgstr "もくじ"
+
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<a href=\"#why\">Why do you call the system we use GNU/Linux and not Linux?</"
@@ -652,7 +644,27 @@
 
"いては関心がありますが、成否の議論には関心がありません。別の方法でかれらの支"
 "持を得ようとは思いませんか?</a>"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our page on <a href=\"/"
+#| "gnu/linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a "
+#| "href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
+"linux-and-gnu.html\">Linux and the GNU System</a>, our page on <a href=\"/"
+"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"この問題についてもっと学ぶには、わたしたちのページの<a
 href=\"/gnu/linux-and-"
+"gnu.html\">LinuxとGNUプロジェクト</a>について、<a 
href=\"/gnu/why-gnu-linux."
+"html\">なぜGNU/Linux?</a>、<a 
href=\"/gnu/gnu-users-never-heard-of-gnu.html"
+"\">GNUについてなにも聞いたことがないGNUユーザ</a>をご覧くã
 ã•ã„。"
+
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you call the system we use GNU/Linux and not Linux? <span class="
 "\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>"
@@ -660,7 +672,7 @@
 "なぜそのシステム
をGNU/Linuxと呼びLinuxと呼ばないのですか? <span class="
 "\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Most operating system distributions based on Linux as kernel are basically "
 "modified versions of the GNU operating system.  We began developing GNU in "
@@ -680,11 +692,11 @@
 
"トとしてはもっとも大きな貢献をしました。基本となるビジョンもわたしたちのもの"
 "でした。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "In fairness, we ought to get at least equal mention."
 msgstr "å…
¬æ­£ã‚’鑑みれば、少なくとも同等の言及があって然るべきでしょう。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and the GNU System</a> and <a "
 "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
@@ -696,7 +708,7 @@
 "ユーザ</a>にもっと詳しい説明があります。また、<a 
href=\"/gnu/the-gnu-project."
 
"html\">GNUプロジェクト</a>は、その歴史について説明しています。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why is the name important? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
@@ -704,7 +716,7 @@
 "なぜ名前が重要なのですか? <span class=\"anchor-reference-id\">(<a 
href="
 "\"#whycare\">#whycare</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Although the developers of Linux, the kernel, are contributing to the free "
 "software community, many of them do not care about freedom.  People who "
@@ -718,7 +730,7 @@
 
"ちのコミュニティにおける歴史的役割として考えてしまいます。そして、その開発è€
…"
 "の見解に必要以上に重きを置いてしまいます。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Calling the system GNU/Linux recognizes the role that our idealism played in "
 "building our community, and <a href=\"/gnu/why-gnu-linux.html\">helps the "
@@ -728,7 +740,7 @@
 "の理想主義の役割を認識させます。そして、<a 
href=\"/gnu/why-gnu-linux.html\">"
 "この考えの実際の重要性をå…
¬è¡†ã«èªè­˜ã•ã›ã‚‹ã®ã«å½¹ç«‹ã¡ã¾ã™</a>。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the real relationship between GNU and Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#what\">#what</a>)</span>"
@@ -736,7 +748,7 @@
 "GNUとLinuxの実際の関係はどうなんですか?<span 
class=\"anchor-reference-id\">"
 "(<a href=\"#what\">#what</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU operating system and the Linux kernel are separate software projects "
 "that do complementary jobs.  Typically they are packaged in a <a href=\"/"
@@ -747,7 +759,7 @@
 
"ディストリビューション</a>としてパッケージとしてまとめられ、一緒に使われま"
 "す。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How did it come about that most people call the system &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
@@ -757,7 +769,7 @@
 "なったわけでしょう?<span class=\"anchor-reference-id\">(<a 
href=\"#howerror"
 "\">#howerror</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; is a confusion that has spread faster "
 "than the corrective information."
@@ -765,7 +777,7 @@
 "このシステムを&ldquo;Linux&rdquo;と呼ぶ混乱は、修正情å 
±ã‚ˆã‚Šã‚‚速く広まりまし"
 "た。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who combined Linux with the GNU system were not aware that that's "
 "what their activity amounted to.  They focused their attention on the piece "
@@ -783,7 +795,7 @@
 
"習を改めるようお願いするまでには何年もかかりました。それまでに、混乱は大きく"
 "有利なスタートをしていたのです。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the people who call the system &ldquo;Linux&rdquo; have never heard "
 "why that's not the right thing.  They saw others using that name and assume "
@@ -801,7 +813,7 @@
 
"開発を始めたとしばしば信じています。この間違った絵は、システãƒ
 ã‚’&ldquo;"
 "Linux&rdquo;と呼ぶべきであるという考えを補強します。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Many of the questions in this file represent people's attempts to justify "
 "the name they are accustomed to using."
@@ -809,7 +821,7 @@
 "このファイルの中のたくさんの疑問は、人々がæ…
£ç¿’的に使ってきた名前を正当化しよ"
 "うとする試みを反映しています。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we always say &ldquo;GNU/Linux&rdquo; instead of &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
@@ -818,7 +830,7 @@
 "か?<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not always&mdash;only when you're talking about the whole system.  When "
 "you're referring specifically to the kernel, you should call it &ldquo;"
@@ -828,7 +840,7 @@
 "て特に指すときには、その開発者が選んだ
名前で&ldquo;Linux&rdquo;と呼ぶべきで"
 "す。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
 "call the whole system by the same name as the kernel.  This causes many "
@@ -844,7 +856,7 @@
 
"び、カーネルを&ldquo;Linux&rdquo;呼ぶことにより、この曖昧さを回避することがで"
 "きます。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Would Linux have achieved the same success if there had been no GNU? <span "
 "class=\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</"
@@ -853,7 +865,7 @@
 
"GNUなしでもLinuxは同じ成功を達成したのではないでしょうか?<span
 class="
 "\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In that alternative world, there would be nothing today like the GNU/Linux "
 "system, and probably no free operating system at all.  No one attempted to "
@@ -867,7 +879,7 @@
 "クトと(その後)バークレイのCSRGだ
けが例外でした。GNUプロジェクトはバークレイ"
 "CSRGに対し、そのコードを自由にするよう特に依é 
¼ã—たのです。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds was partly influenced by a speech about GNU in Finland in "
 "1990.  It's possible that even without this influence he might have written "
@@ -881,7 +893,7 @@
 "1992年にリーナスがGNU 
GPLのもとリリースして、Linuxは自由となりました。(バー"
 "ジョン0.12のリリースノートを参照してください。)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Even if Torvalds had released Linux under some other free software license, "
 "a free kernel alone would not have made much difference to the world.  The "
@@ -893,7 +905,7 @@
 "う。Linuxの重要性は、より大きなフレーム
ワーク、すなわち、完全に自由なオペレー"
 "ティングシステム
GNU/Linuxに適合することから来ているのです。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better for the community if you did not divide people with "
 "this request? <span class=\"anchor-reference-id\">(<a href=\"#divide"
@@ -903,7 +915,7 @@
 "しょうか? <span class=\"anchor-reference-id\">(<a 
href=\"#divide\">#divide</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
 "people.  We are asking them to give the GNU Project credit for the GNU "
@@ -914,7 +926,7 @@
 
"GNUプロジェクトに謝意を示すことをお願いしているのです。これは誰かを批判した"
 "り、誰かを押しやるのではありません。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, there are people who do not like our saying this.  Sometimes those "
 "people push us away in response.  On occasion they are so rude that one "
@@ -929,7 +941,7 @@
 
"しまいがちです。ですから、わたしたちは、あなたがたがかれらに(そういったè„
…し"
 "を)止めるよう、説得できることを望みます。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, this is only a secondary cause of division in our community.  The "
 "largest division in the community is between people who appreciate free "
@@ -944,7 +956,7 @@
 "フトウェア運動の支持者)と、実際的な利益だ
けと現在の自由ソフトウェアを効率的な"
 "開発モデルを引く人々
(オープンソース運動)の間にあります。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This disagreement is not just a matter of names&mdash;it is a matter of "
 "differing basic values.  It is essential for the community to see and think "
@@ -959,7 +971,7 @@
 
"philosophy/open-source-misses-the-point.html\">なぜ、オープンソースは自由ソフ"
 "トウェアの的を外すのか</a>をご覧ください。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The disagreement over values partially aligns with the amount of attention "
 "people pay to the GNU Project's role in our community.  People who value "
@@ -983,7 +995,7 @@
 
"を置くわたしたちがすべての人を説得するか(容易なことではありません)、完å
…¨ã«æ•—"
 
"北してしまうか(そうでないことを希望します)、そのどちらかまでなくなりません。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Doesn't the GNU project support an individual's free speech rights to call "
 "the system by any name that individual chooses? <span class=\"anchor-"
@@ -993,7 +1005,7 @@
 "のシステム
をどのような名前でも呼ぶ権利があるはずでしょう?<span 
class="
 "\"anchor-reference-id\">(<a href=\"#freespeech\">#freespeech</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Yes, indeed, we believe you have a free speech right to call the operating "
 "system by any name you wish.  We ask that people call it GNU/Linux as a "
@@ -1007,7 +1019,7 @@
 
"いし、GNUが表す自由の価値を奨励し、オペレーティングシステãƒ
 ãŒå­˜åœ¨ã™ã‚‹ã‚ˆã†ã«ã‚‚"
 "たらした自由の価値を、ほかの人々
に伝えようとするのです。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since everyone knows the role of GNU in developing the system, doesn't the "
 "&ldquo;GNU/&rdquo; in the name go without saying? <span class=\"anchor-"
@@ -1017,7 +1029,7 @@
 "GNU/&rdquo;はなくても良いのではないでしょうか?<span 
class=\"anchor-reference-"
 "id\">(<a href=\"#everyoneknows\">#everyoneknows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Experience shows that the system's users, and the computer-using public in "
 "general, often know nothing about the GNU system.  Most articles about the "
@@ -1031,7 +1043,7 @@
 
"href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNUについてまったく聞いたこと"
 "がないGNUユーザ</a>で詳しく説明されています。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who say this are probably geeks thinking of the geeks they know.  "
 "Geeks often do know about GNU, but many have a completely wrong idea of what "
@@ -1044,7 +1056,7 @@
 "\">&ldquo;tools&rdquo;</a>のコレクションだ
と考えていたり、ツールを開発するプ"
 "ロジェクトだと考えています。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The wording of this question, which is typical, illustrates another common "
 "misconception.  To speak of &ldquo;GNU's role&rdquo; in developing something "
@@ -1058,7 +1070,7 @@
 
"何かほかの活動についてGNUプロジェクトの役割について語ることは意味があります"
 "が、GNUの活動については意味をなさないでしょう。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since I know the role of GNU in this system, why does it matter what name I "
 "use? <span class=\"anchor-reference-id\">(<a href="
@@ -1068,7 +1080,7 @@
 "うかが問題になるのでしょう? <span 
class=\"anchor-reference-id\">(<a href="
 "\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your words don't reflect your knowledge, you don't teach others.  Most "
 "people who have heard of the GNU/Linux system think it is &ldquo;"
@@ -1081,7 +1093,7 @@
 
"によって始められ、「オープンソース」を意図していたと考えています。あなたが"
 "人々にそれを言わないのであれば、誰が言うでしょうか?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't shortening &ldquo;GNU/Linux&rdquo; to &ldquo;Linux&rdquo; just like "
 "shortening &ldquo;Microsoft Windows&rdquo; to &ldquo;Windows&rdquo;? <span "
@@ -1091,7 +1103,7 @@
 "&ldquo;Microsoft Windows&rdquo;を&ldquo;Windows&rdquo;とするように? 
<span "
 "class=\"anchor-reference-id\">(<a href=\"#windows\">#windows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It's useful to shorten a frequently-used name, but not if the abbreviation "
 "is misleading."
@@ -1099,7 +1111,7 @@
 
"よく使われる名前を短くすることは有用です。しかし短縮形が紛らわしくないå
 ´åˆã§"
 "す。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Almost everyone in developed countries really does know that the &ldquo;"
 "Windows&rdquo; system is made by Microsoft, so shortening &ldquo;Microsoft "
@@ -1114,7 +1126,7 @@
 "ることは、システム
がどこから来たかについて間違った考えを与えてしまうでしょ"
 "う。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The question is itself misleading because GNU and Microsoft are not the same "
 "kind of thing.  Microsoft is a company; GNU is an operating system."
@@ -1123,7 +1135,7 @@
 
"はありませんから。マイクロソフトは会社です。GNUはオペレーティング・システãƒ
 ã§"
 "す。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't GNU a collection of programming tools that were included in Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
@@ -1131,7 +1143,7 @@
 
"GNUはLinuxに含まれるプログラミングツールのコレクションではないのですか?<span
 "
 "class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "People who think that Linux is an entire operating system, if they hear "
 "about GNU at all, often get a wrong idea of what GNU is.  They may think "
@@ -1149,7 +1161,7 @@
 
"であるという考えは、&ldquo;Linux&rdquo;とラベルがつけられたオペレーティング・"
 "システムの概念のフレーム
ワークにはなかなか適合しません。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Project was named after the GNU operating system&mdash;it's the "
 "project to develop the GNU system.  (See <a href=\"/gnu/initial-announcement."
@@ -1159,7 +1171,7 @@
 "GNUシステムを開発するプロジェクトです。(<a 
href=\"/gnu/initial-announcement."
 "html\">1983年の最初の声明</a>を参照ください。)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We developed programs such as GCC, GNU Emacs, GAS, GLIBC, BASH, etc., "
 "because we needed them for the GNU operating system.  GCC, the GNU Compiler "
@@ -1173,7 +1185,7 @@
 
"くためのコンパイラです。わたしたち、GNUプロジェクトに働くたくさんの人ã€
…は、"
 "Ghostscript、GNUCash、GNU ChessそしてGNOMEもGNUシステム
のために開発しました。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the difference between an operating system and a kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
@@ -1181,7 +1193,7 @@
 "オペレーティングシステム
とカーネルの違いはなんですか? <span class=\"anchor-"
 "reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "An operating system, as we use the term, means a collection of programs that "
 "are sufficient to use the computer to do a wide variety of jobs.  A general "
@@ -1193,7 +1205,7 @@
 "一般目的のオペレーティング・システムは、完å…
¨ã§ã‚るために、多くの利用者がやり"
 "たいと考えるすべての仕事を扱えるべきです。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The kernel is one of the programs in an operating system&mdash;the program "
 "that allocates the machine's resources to the other programs that are "
@@ -1203,7 +1215,7 @@
 "を実行するプログラムに割り当てるプログラム
です。カーネルはまた、ほかのプログ"
 "ラム
の実行を開始したり、止めたりすることを取り扱います。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "To confuse matters, some people use the term &ldquo;operating system&rdquo; "
 "to mean &ldquo;kernel&rdquo;.  Both uses of the term go back many years.  "
@@ -1223,7 +1235,7 @@
 "イクなオペレーティング・システム
にすると意図していました。そして、「オペレー"
 "ティング・システム
」という用語を(Unixと)同じように使っています。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the time when people speak of the &ldquo;Linux operating "
 "system&rdquo; they are using &ldquo;operating system&rdquo; in the same "
@@ -1240,7 +1252,7 @@
 
"&ldquo;Linux&rdquo;は正しい名前ですが、「カーネル」とも言ってソフトウェアのど"
 "れを意味しているか曖昧さを回避するようにしてくだ
さい。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
@@ -1252,7 +1264,7 @@
 "ことを好むのであれば、それは構いません。そのå 
´åˆã€GNU/Linuxシステム・ディスト"
 "リビューションについて語ることになるでしょう。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The kernel of a system is like the foundation of a house.  How can a house "
 "be almost complete when it doesn't have a foundation? <span class=\"anchor-"
@@ -1262,7 +1274,7 @@
 "ど完成するなんてことがあるでしょうか?<span 
class=\"anchor-reference-id\">(<a "
 "href=\"#house\">#house</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "A kernel is not much like the foundation of a house because building an "
 "operating system is not much like building a house."
@@ -1270,7 +1282,7 @@
 
"カーネルは家の基礎には似ていません。なぜならオペレーティング・システãƒ
 ã®æ§‹ç¯‰"
 "は家の構築には似ていないからです。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A house is built from lots of little general parts that are cut and put "
 "together in situ.  They have to be put together from the bottom up.  Thus, "
@@ -1282,7 +1294,7 @@
 
"築されてなければ、本質的な部分は構築されることができず、地面の穴ã
 ã‘しかでき"
 "ません。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "By contrast, an operating system consists of complex components that can be "
 "developed in any order.  When you have developed most of the components, "
@@ -1297,7 +1309,7 @@
 
"似ています。宇宙ステーションのモジュールのほとんどが軌道に乗り、ほかの重要な"
 "モジュールを待っているとき、1992年のGNUシステム
のようだと言えるでしょう。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't the kernel the brain of the system? <span class=\"anchor-reference-id"
 "\">(<a href=\"#brain\">#brain</a>)</span>"
@@ -1305,7 +1317,7 @@
 "カーネルはシステムのé 
­è„³ã¨ã„うべきものではないですか<span class=\"anchor-"
 "reference-id\">(<a href=\"#brain\">#brain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A computer system is not much like a human body, and no part of it plays a "
 "role comparable to that of the brain in a human."
@@ -1313,7 +1325,7 @@
 "コンピュータ・システム
は人体とは似ても似つきませんし、人体のé 
­è„³ã®ã‚ˆã†ã«åƒã"
 "部分はどこにもありません。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't writing the kernel most of the work in an operating system? <span "
 "class=\"anchor-reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</"
@@ -1323,11 +1335,11 @@
 "いでしょうか? <span class=\"anchor-reference-id\">(<a 
href=\"#kernelmost"
 "\">#kernelmost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "No, many components take a lot of work."
 msgstr 
"いいえ、たくさんのコンポーネント(を書くこと)が多くの仕事になります。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "An operating system requires a kernel.  Since the GNU Project didn't develop "
 "a kernel, how can the system be GNU?<span class=\"anchor-reference-id\">(<a "
@@ -1338,7 +1350,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#nokernel\">#nokernel</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The people who argue that way for calling the system &ldquo;Linux&rdquo; are "
 "using a double standard.  An operating system requires compilers, editors, "
@@ -1353,7 +1365,7 @@
 
"トーバルズはそのどれも開発していないのですから、どうしてそのシステãƒ
 ã‚’&ldquo;"
 "Linux&rdquo;と呼べるのですか?"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "That standard is too strict, not the right way to judge the contributions of "
 "any contributor."
@@ -1361,7 +1373,7 @@
 "この基準はとても厳しく、どの貢献者
の貢献を判断するにも正しい方法ではありませ"
 "ん。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds made an important contribution to the operating system we "
 "use; the GNU Project started earlier and contributed much more.  The name "
@@ -1371,7 +1383,7 @@
 
"要な貢献をしました。GNUプロジェクトはそれよりも早く開始され、より多く貢献しま"
 
"した。&ldquo;GNU/Linux&rdquo;の名前はそれぞれにクレジットを与えています。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How can GNU be an operating system, if I can't get something called &ldquo;"
 "GNU&rdquo; and install it? <span class=\"anchor-reference-id\">(<a href="
@@ -1382,7 +1394,7 @@
 "\"anchor-reference-id\">(<a href=\"#notinstallable\">#notinstallable</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Many <a href=\"/distros/distros.html\"> packaged and installable versions of "
 "GNU</a> are available.  None of them is called simply &ldquo;GNU&rdquo;, but "
@@ -1392,7 +1404,7 @@
 
"なGNUのバージョン</a>が利用可能です。そのどれもが単に&ldquo;GNU&rdquo;と呼ば"
 "れることはありませんが、それらは基本的にGNUです。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We expected to release the GNU system packaged for installation, but this "
 "plan was overtaken by events: in 1992 others were already packaging GNU "
@@ -1413,7 +1425,7 @@
 "ら、それは、GNU Hurdカーネル(まだ
できていなかった)のシステムの版の名前のため"
 "だったからです。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Hurd kernel never became sufficiently ready; we only recommend it to "
 "those interested in working on it.  So we never packaged GNU with the GNU "
@@ -1424,7 +1436,7 @@
 
"ネルでGNUをパッケージしたことは決してありません。ですが、Debianはこの組み合わ"
 "せをDebian GNU/Hurdとしてパッケージしてます。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are now developing an advanced Scheme-based package manager called Guix "
 "and a complete system distribution based on it called the <a href=\"/"
@@ -1436,7 +1448,7 @@
 "(GuixSD)と呼ばれる完全なシステム
・ディストリビューションを開発しています。そ"
 "して、これにはGNUシステム
の主要な部分を再パッケージすることが含まれます。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We never took the last step of packaging GNU under the name &ldquo;"
 "GNU&rdquo;, but that doesn't alter what kind of thing GNU is.  GNU is an "
@@ -1446,7 +1458,7 @@
 
"ステップを踏み出していません。しかし、これがGNUはどういった種類のものかを変え"
 "ることはありません。GNUはオペレーティング・システム
の一つです。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "We're calling the whole system after the kernel, Linux.  Isn't it normal to "
 "name an operating system after a kernel? <span class=\"anchor-reference-id\">"
@@ -1456,7 +1468,7 @@
 "レーティング・システム
の名前をつけることは普通ではないですか? <span class="
 "\"anchor-reference-id\">(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "That practice seems to be very rare&mdash;we can't find any examples other "
 "than the misuse of the name &ldquo;Linux&rdquo;.  Normally an operating "
@@ -1471,7 +1483,7 @@
 "ます。カーネルは通常、それ自身の名前を持たず、人々
は「なんとかのカーネル」、"
 "あるいは「なんとかカーネル」と言うように言います。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Because those two constructions are used synonymously, the expression &ldquo;"
 "the Linux kernel&rdquo; can easily be misunderstood as meaning &ldquo;the "
@@ -1485,7 +1497,7 @@
 
"避するためには「そのカーネルLinux」あるいは「Linux、そのカーネル」というよう"
 "に言ったり書いたりすることがよいでしょう。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can another system have &ldquo;the feel of Linux&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
@@ -1493,7 +1505,7 @@
 "別のシステム
が&ldquo;Linuxの感触&rdquo;を持つことがありうるでしょうか?<span
 "
 "class=\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is no such thing as the &ldquo;feel of Linux&rdquo; because Linux has "
 "no user interfaces.  Like any modern kernel, Linux is a base for running "
@@ -1507,7 +1519,7 @@
 
"のところに属します。GNU/Linuxと人間のインタラクションは、いつでも別のプログラ"
 "ム
を通して行われます。そして、「感触」はそこから発します。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  How about "
 "recommending a shorter name? <span class=\"anchor-reference-id\">(<a href="
@@ -1517,7 +1529,7 @@
 "せんか? <span class=\"anchor-reference-id\">(<a 
href=\"#long\">#long</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "For a while we tried the name &ldquo;LiGNUx&rdquo;, which combines the words "
 "&ldquo;GNU&rdquo; and &ldquo;Linux&rdquo;.  The reaction was very bad.  "
@@ -1527,7 +1539,7 @@
 
"せのLiGNUx&rdquo;という名前を試しました。反応はとても悪いものでした。人ã€
…は"
 "&ldquo;GNU/Linux&rdquo;の方をより認めました。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
 "call it &ldquo;GNU/Linux&rdquo; <a href=\"#justgnu\"> for the reasons given "
@@ -1536,7 +1548,7 @@
 "このシステム
の最短の正しい名前は&ldquo;GNU&rdquo;ですが、<a href=\"#justgnu"
 
"\">下記に示す理由</a>により、わたしたちは&ldquo;GNU/Linux&rdquo;と呼びます。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How about calling the system &ldquo;GliNUx&rdquo; (instead of &ldquo;GNU/"
 "Linux&rdquo;)? <span class=\"anchor-reference-id\">(<a href="
@@ -1546,7 +1558,7 @@
 "らどうでしょう? <span class=\"anchor-reference-id\">(<a href="
 "\"#long1\">#long1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The name &ldquo;GNU&rdquo; does not visibly appear in &ldquo;Glinux,&rdquo; "
 "so most people would not notice it is there.  Even if it is capitalized as "
@@ -1557,7 +1569,7 @@
 
"ほとんどの人は気がつかないでしょう。&ldquo;GliNUx,&rdquo;と大文字にしたとして"
 "もほとんどの人は、GNUを示すものがå…
¥ã£ã¦ã„るとわからないでしょう。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be comparable to writing &ldquo;GNU/Linux,&rdquo; but putting "
 "&ldquo;GNU/&rdquo; in print so small that most people could not read it."
@@ -1565,7 +1577,7 @@
 
"これは、&ldquo;GNU/Linux,&rdquo;と書くけれども&ldquo;GNU/&rdquo;をとても小さ"
 
"く印刷してほとんどの人が読めないという状況と同程度でしょう。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  Why should "
 "I go to the trouble of saying &ldquo;GNU/&rdquo;? <span class=\"anchor-"
@@ -1575,7 +1587,7 @@
 "ざ言うべきでしょうか? <span class=\"anchor-reference-id\">(<a href="
 "\"#long2\">#long2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
 "the system that we developed, can't you take one second to recognize our "
@@ -1585,7 +1597,7 @@
 "ちが開発したシステム
に感謝するなら、わたしたちの仕事を認めるのに一秒かけても"
 "らえないでしょうか?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Unfortunately, &ldquo;GNU/Linux&rdquo; is five syllables. People won't use "
 "such a long term. Shouldn't you find a shorter one? <span class=\"anchor-"
@@ -1595,7 +1607,7 @@
 
"い単語を使わないでしょう。もっと短いのをみつけてはどうですか?<span
 class="
 "\"anchor-reference-id\">(<a href=\"#long3\">#long3</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, &ldquo;GNU/Linux&rdquo; is only four syllables.  &ldquo;"
 "Unfortunately&rdquo; is five syllables, yet people show no sign of "
@@ -1604,7 +1616,7 @@
 "実は、&ldquo;GNU/Linux&rdquo;は4音節だ
けです。&ldquo;Unfortunately&rdquo;は5"
 "音節ですが、人々は、この語を使うのを嫌がるå…
†å€™ã‚’なんらみせてません。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Stallman doesn't ask us to call him &ldquo;Richard Matthew Stallman&rdquo; "
 "every the time.  So why ask us to say &ldquo;GNU/Linux&rdquo; every time? "
@@ -1615,7 +1627,7 @@
 "求めるのですか? <span class=\"anchor-reference-id\">(<a href="
 "\"#long4\">#long4</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Omitting &ldquo;Matthew&rdquo; does not misrepresent anything important "
 "about Stallman's nature, origin, ideas or purpose.  Omitting &ldquo;"
@@ -1625,7 +1637,7 @@
 
"いて、なんら重要なことをごまかしていません。&ldquo;GNU&rdquo;を省略することは"
 "GNU/Linuxシステム
について重要なことがらをごまかしています。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is an example of a frequent way of hiding a fallacy: to bury it inside "
 "a misleading analogy.  A better analogy would be, &ldquo;Why shouldn't we "
@@ -1635,7 +1647,7 @@
 
"です。よりよいアナロジーは「ストールマンを『トーバルズ』とよぶべきではないで"
 "すか?」ではないでしょうか。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since Linux is a secondary contribution, would it be false to the facts to "
 "call the system simply &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id"
@@ -1645,7 +1657,7 @@
 "いですよね?<span class=\"anchor-reference-id\">(<a href=\"#justgnu"
 "\">#justgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would not be false to the facts, but it is not the best thing to do.  "
 "Here are the reasons we call that system version &ldquo;GNU/Linux&rdquo; "
@@ -1655,7 +1667,7 @@
 "が、システム
の版を単に&ldquo;GNU&rdquo;ではなく&ldquo;GNU/Linux&rdquo;と呼ぶ"
 "理由は下記のとおりです:"
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It's not exactly GNU&mdash;it has a different kernel (that is, Linux).  "
 "Distinguishing GNU/Linux from GNU is useful."
@@ -1663,7 +1675,7 @@
 
"それはGNUそのものではなく違うカーネル(すなわちLinux)を有します。GNUとGNU/"
 "Linuxを区別することは有用です。"
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It would be ungentlemanly to ask people to <em>stop</em> giving any credit "
 "to Linus Torvalds.  He did write an important component of the system.  We "
@@ -1682,7 +1694,7 @@
 
"はかれの政治的見解に強く反対しますが、見解の相違を立派にかつ、å
…¬ç„¶ã¨æ‰±ã„ま"
 "す。システム
に対するかれの貢献の謝辞から外すようにするのではなく。"
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
 "&ldquo;GNU&rdquo; they may simply not recognize we're talking about the same "
@@ -1694,7 +1706,7 @@
 "語っているとは人々
はすぐには認識できないでしょう。もし、&ldquo;GNU/"
 "Linux&rdquo;と言うと、人々
は、聞いたことがあるものとつなげることができます。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "I would have to pay a fee if I use &ldquo;Linux&rdquo; in the name of a "
 "product, and that would also apply if I say &ldquo;GNU/Linux&rdquo;.  Is it "
@@ -1708,7 +1720,7 @@
 "ですか? <span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There's nothing wrong in calling the system &ldquo;GNU&rdquo;; basically, "
 "that's what it is.  It is nice to give Linus Torvalds a share of the credit "
@@ -1719,7 +1731,7 @@
 "ことです。しかし、あなたはそうすることの優å…
ˆæ¨©ã®ãŸã‚ã«æ”¯æ‰•ã†ç¾©å‹™ã¯ã‚りませ"
 "ん。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "So if you want to refer to the system simply as &ldquo;GNU&rdquo;, to avoid "
 "paying the fee for calling it &ldquo;Linux&rdquo;, we won't criticize you."
@@ -1728,7 +1740,7 @@
 "テムを単に&ldquo;GNU&rdquo;として参照したいå 
´åˆã€ã‚ãŸã—たちはあなたを批判しな"
 "いでしょう。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today; it includes "
 "TeX, X11, Apache, Perl, and many more programs.  Don't your arguments imply "
@@ -1742,7 +1754,7 @@
 "鹿げています。) <span class=\"anchor-reference-id\">(<a href=\"#many"
 "\">#many</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "What we say is that you ought to give the system's principal developer a "
 "share of the credit.  The principal developer is the GNU Project, and the "
@@ -1751,7 +1763,7 @@
 "わたしたちが言いたいのは、システムの主要な開発者
に謝意を表するべきだというこ"
 "とです。GNUプロジェクトが主要な開発者、システム
は基本的にGNUなのです。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you feel even more strongly about giving credit where it is due, you "
 "might feel that some secondary contributors also deserve credit in the "
@@ -1766,7 +1778,7 @@
 "GNU/X11/Linuxと呼びたいのであれば、そうしてくだ
さい。Perlについてもっと主張す"
 "べきだ
と感じて、GNU/Linux/Perlと書きたいのであれば、そうしてくだ
さい。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Since a long name such as GNU/X11/Apache/Linux/TeX/Perl/Python/FreeCiv "
 "becomes absurd, at some point you will have to set a threshold and omit the "
@@ -1779,7 +1791,7 @@
 
"ついては省略せざるをえないでしょう。しきい値の設定について明確な正しい点はあ"
 
"りませんから、どこに設定しても、わたしたちはそれに反論しません。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Different threshold levels would lead to different choices of name for the "
 "system.  But one name that cannot result from concerns of fairness and "
@@ -1793,7 +1805,7 @@
 
"て、ひとつの二次的な貢献(Linux)にすべての謝意を示すというのはå
…¬æ­£ã¨ã¯ãªã‚Šãˆã¾"
 "せん。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "systemd plays an important role in the GNU/Linux system as it is today; are "
 "we obligated to call it GNU/systemd/Linux? <span class=\"anchor-reference-id"
@@ -1803,7 +1815,7 @@
 "systemd/Linuxと呼ばなくてはなりませんか? <span 
class=\"anchor-reference-id\">"
 "(<a href=\"#others\">#others</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "systemd is a fairly important component, but not as important as the kernel "
 "(Linux), nor as important as the basis of the system as a whole (GNU).  "
@@ -1813,7 +1825,7 @@
 
"systemdはたしかに重要なコンポーネントですが、カーネル(Linux)と同じように重要"
 "ではなく、全体のシステム
の基盤(GNU)と同じように重要でもありません。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today, but they don't "
 "insist on calling it XYZ/Linux.  Why should we treat GNU specially? <span "
@@ -1824,7 +1836,7 @@
 "きなのでしょうか? <span class=\"anchor-reference-id\">(<a 
href=\"#others"
 "\">#others</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Thousands of projects have developed programs commonly included in today's "
 "GNU/Linux systems.  They all deserve credit for their contributions, but "
@@ -1836,7 +1848,7 @@
 "ステムの主要な開発者
ではありませんから、そのように謝意を受けるようには要求し"
 "ません。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is different because it is more than just a contributed program, more "
 "than just a collection of contributed programs.  GNU is the framework on "
@@ -1846,7 +1858,7 @@
 "クション以上のものだということです。GNUはシステム
が作られたフレームワークなの"
 "です。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "GNU is a small fraction of the system nowadays, so why should we mention it? "
 "<span class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</"
@@ -1856,7 +1868,7 @@
 "しょうか?<span class=\"anchor-reference-id\">(<a href=\"#allsmall"
 "\">#allsmall</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In 2008, we found that GNU packages made up 15% of the &ldquo;main&rdquo; "
 "repository of the gNewSense GNU/Linux distribution.  Linux made up 1.5%.  So "
@@ -1868,7 +1880,7 @@
 
"た。ですから、同じ議論を適用すると、&ldquo;Linux&rdquo;と呼ぶことについて、"
 "もっと強く言えることになるでしょうか。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is a small fraction of the system nowadays, and Linux is an even smaller "
 "fraction.  But they are the system's core; the system was made by combining "
@@ -1879,7 +1891,7 @@
 
"わせて作られるのです。ですから&ldquo;GNU/Linux&rdquo;の名前は、今もなお、適切"
 "です。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many companies contributed to the system as it is today; doesn't that mean "
 "we ought to call it GNU/Red&nbsp;Hat/Novell/Linux? <span class=\"anchor-"
@@ -1890,7 +1902,7 @@
 "\"anchor-reference-id\">(<a href=\"#manycompanies\">#manycompanies</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is not comparable to Red Hat or Novell; it is not a company, or an "
 "organization, or even an activity.  GNU is an operating system.  (When we "
@@ -1904,7 +1916,7 @@
 "Linuxシステム
はGNUをもとにしたものですから、その名前にGNUがあって然るべきで"
 "す。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Much of those companies' contribution to the GNU/Linux system lies in the "
 "code they have contributed to various GNU packages including GCC and GNOME.  "
@@ -1915,7 +1927,7 @@
 
"ざまなGNUパッケージにのコードに対して行われています。GNU/Linuxと言うことは、"
 "そういった会社と同様にほかのGNU開発者
に謝意を示すことになります。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
@@ -1925,7 +1937,7 @@
 "くて?<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean "
@@ -1937,7 +1949,7 @@
 
"ケージのLinux」を意味するでしょう。このどちらの意味も手å
…ƒã®çŠ¶æ³ã«é©åˆã—ませ"
 "ん。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is not a GNU package; that is, it wasn't developed under the GNU "
 "Project's aegis or contributed specifically to the GNU Project.  Linus "
@@ -1950,14 +1962,24 @@
 
"て書きました。ですから、「GNUパッケージのLinux」は意味として正しくありませ"
 "ん。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "We're not talking about a distinct GNU version of Linux, the kernel.  The "
+#| "free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/";
+#| "project/linux\">separate version of Linux</a>, since the &ldquo;"
+#| "standard&rdquo; version contains non-free firmware &ldquo;blobs&rdquo;.  "
+#| "If this were part of the GNU Project, it could be considered &ldquo;GNU "
+#| "Linux&rdquo;; but we would not want to call it that, because it would be "
+#| "too confusing."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
-"free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/project/";
-"linux\">separate version of Linux</a>, since the &ldquo;standard&rdquo; "
-"version contains non-free firmware &ldquo;blobs&rdquo;.  If this were part "
-"of the GNU Project, it could be considered &ldquo;GNU Linux&rdquo;; but we "
-"would not want to call it that, because it would be too confusing."
+"free GNU/Linux distros do have a <a href=\"https://directory.fsf.org/wiki/";
+"Linux-libre\">separate version of Linux</a>, since the &ldquo;"
+"standard&rdquo; version contains nonfree firmware &ldquo;blobs&rdquo;.  If "
+"this were part of the GNU Project, it could be considered &ldquo;GNU "
+"Linux&rdquo;; but we would not want to call it that, because it would be too "
+"confusing."
 msgstr ""
 
"わたしたちはカーネルLinuxのGNUの固有の版について話しているのではありません。"
 "「標準」版は不自由なファーム
ウェア「ブロブ」を含むため、自由なGNU/Linuxディス"
@@ -1966,7 +1988,7 @@
 
"と考えられるでしょうが、それではあまりにも複雑ですから、わたしたちはそのよう"
 "に呼ぼうとはしません。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We're talking about a version of GNU, the operating system, distinguished by "
 "having Linux as the kernel.  A slash fits the situation because it means "
@@ -1979,7 +2001,7 @@
 "てください。) このシステム
はGNUとLinuxの組み合わせであり、&ldquo;GNU/"
 "Linux&rdquo;なのです。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are other ways to express &ldquo;combination&rdquo;.  If you think "
 "that a plus-sign is clearer, please use that.  In French, a hyphen is clear: "
@@ -1991,7 +2013,7 @@
 
"Linux&rdquo;とするのが明解でしょう。スペイン語では、わたしたちは時ã€
…&ldquo;"
 "GNU con Linux&rdquo;と言います。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How is the name &ldquo;GNU/Linux&rdquo; pronounced? <span class=\"anchor-"
 "reference-id\">(<a href=\"#pronounce\">#pronounce</a>)</span>"
@@ -1999,7 +2021,7 @@
 "この名称、&ldquo;GNU/Linux&rdquo; はどう発音しますか? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#pronounce\">#pronounce</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please pronounce it as &ldquo;GNU slash Linux.&rdquo; If you don't pronounce "
 "the slash, people will think you are saying &ldquo;GNU Linux,&rdquo; which "
@@ -2009,7 +2031,7 @@
 "と、人々は &ldquo;GNU Linux&rdquo; 
と言っていると考えてしまいますから、<a "
 
"href=\"#whyslash\">このコンビネーションにはふさわしくありません</a>。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU Emacs&rdquo; rather than &ldquo;GNU/"
 "Emacs&rdquo;? <span class=\"anchor-reference-id\">(<a href=\"#whynoslash"
@@ -2019,7 +2041,7 @@
 "くて? <span class=\"anchor-reference-id\">(<a href=\"#whynoslash"
 "\">#whynoslash</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Emacs&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Emacs&rdquo;.  That is the right "
@@ -2029,7 +2051,7 @@
 
"が&ldquo;Linux&rdquo;を修飾します。これは、GNUパッケージの、Emacsと呼ばれるプ"
 "ログラムを述べるのに正しい方法です。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;GNU/Emacs&rdquo; would mean the combination of GNU, the operating "
 "system, and the program Emacs.  That doesn't fit this program, so &ldquo;GNU/"
@@ -2039,7 +2061,7 @@
 
"み合わせを意味してしまうでしょう。それは、このプログラãƒ
 ã«é©åˆã—ませんから、"
 "&ldquo;GNU/Emacs&rdquo;はこのプログラム
を指すのに間違った方法です。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why &ldquo;GNU/Linux&rdquo; rather than &ldquo;Linux/GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
@@ -2048,7 +2070,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is right and proper to mention the principal contribution first.  The GNU "
 "contribution to the system is not only bigger than Linux and prior to Linux, "
@@ -2058,7 +2080,7 @@
 "貢献は単にLinuxよりも大きく先んじたというだ
けでなく、実に全体の活動をわたした"
 "ちが開始したのです。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the lowest "
 "level of the system and GNU fills technically higher levels."
@@ -2066,7 +2088,7 @@
 "加
えて、&ldquo;GNU/Linux&rdquo;はLinuxが最下位のレベルであり、GNUが技術的に上"
 "位のレベルを埋めるという事実をよく表します。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
 "lot better than what people usually do, which is to omit GNU entirely and "
@@ -2076,7 +2098,7 @@
 "れば、通常人々が行う、GNUにまったく触れずにあたかもå…
¨ä½“のシステムがLinuxであ"
 "るかのように扱う方法よりもだいぶ良いでしょう。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
 "say anything about what the system consists of.  Why shouldn't they call it "
@@ -2088,7 +2110,7 @@
 "いように呼べばいいのではないでしょうか? <span 
class=\"anchor-reference-id\">"
 "(<a href=\"#distronames0\">#distronames0</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling a system &ldquo;Foobar Linux&rdquo; implies that it's a flavor of "
 "&ldquo;Linux,&rdquo; and people <a href=\"#distronames\">understand it that "
@@ -2098,7 +2120,7 @@
 "の一種であることを意味し、人々は<a 
href=\"#distronames\">その方法で理解する</"
 "a>ことになります。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If they called a GNU/Linux distro &ldquo;Foobar BSD,&rdquo; you would call "
 "that a mistake.  &ldquo;This system is not BSD,&rdquo; you would tell them.  "
@@ -2108,7 +2130,7 @@
 "違いだと言うでしょう。「このシステム
はBSDではない」と言うのではないでしょう"
 "か。えぇ、Linuxでもありません、よ。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro is called &ldquo;Foobar Linux&rdquo;; doesn't that show it's "
 "really Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
@@ -2118,7 +2140,7 @@
 "Linuxと見せていませんか? <span class=\"anchor-reference-id\">(<a 
href="
 "\"#distronames\">#distronames</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It means that the people who make the &ldquo;Foobar Linux&rdquo; distro are "
 "repeating the common mistake. We appreciate that distributions like Debian, "
@@ -2132,7 +2154,7 @@
 
"く評価し、もしあなたが異なるディストリビューションに関係しているならば、あな"
 "たが同じようにすることを推奨するよう希望します。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's official name is &ldquo;Foobar Linux&rdquo;; isn't it wrong to "
 "call the distro anything but &ldquo;Foobar Linux&rdquo;? <span class="
@@ -2142,7 +2164,7 @@
 "を&ldquo;Foobar 
Linux&rdquo;以外で呼ぶのは間違いではないですか? <span class="
 "\"anchor-reference-id\">(<a href=\"#distronames1\">#distronames1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When they spread misinformation by changing &ldquo;GNU&rdquo; to &ldquo;"
 "Linux&rdquo;, and call their version of it &ldquo;Foobar Linux&rdquo;, it's "
@@ -2154,7 +2176,7 @@
 "は、あなたがそれを&ldquo;Foobar 
GNU/Linux&rdquo;と呼ぶことによって、その間"
 "違った情報を修正することが正しいことです。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be more effective to ask companies such as Mandrake, Red Hat and "
 "IBM to call their distributions &ldquo;GNU/Linux&rdquo; rather than asking "
@@ -2166,7 +2188,7 @@
 "的ではないでしょうか? <span class=\"anchor-reference-id\">(<a href="
 "\"#companies\">#companies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It isn't a choice of one or the other&mdash;we ask companies and "
 "organizations and individuals to help spread the word about this.  In fact, "
@@ -2184,7 +2206,7 @@
 "金を期待
できます。」と言いました。別の言葉で言うと、その会社はなにが正しいか"
 "は気にしないということです。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We can't make them do this right, but we're not the sort to give up just "
 "because the road isn't easy.  You may not have as much influence at your "
@@ -2199,7 +2221,7 @@
 "がシステム
を&ldquo;GNU/Linux&rdquo;と呼んでより多くの利益をあげるようにできる"
 "のです。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to reserve the name &ldquo;GNU/Linux&rdquo; for "
 "distributions that are purely free software? After all, that is the ideal of "
@@ -2211,15 +2233,26 @@
 "すから。<span class=\"anchor-reference-id\">(<a 
href=\"#reserve\">#reserve</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+#, fuzzy
+#| msgid ""
+#| "The widespread practice of adding non-free software to the GNU/Linux "
+#| "system is a major problem for our community.  It teaches the users that "
+#| "non-free software is ok, and that using it is part of the spirit of "
+#| "&ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part "
+#| "of their mission to help users use non-free add-ons, and may even invite "
+#| "salesmen to come and make sales pitches for them.  They adopt goals such "
+#| "as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them "
+#| "use non-free applications and drivers), or making the system more popular "
+#| "even at the cost of freedom."
 msgid ""
-"The widespread practice of adding non-free software to the GNU/Linux system "
-"is a major problem for our community.  It teaches the users that non-free "
+"The widespread practice of adding nonfree software to the GNU/Linux system "
+"is a major problem for our community.  It teaches the users that nonfree "
 "software is ok, and that using it is part of the spirit of &ldquo;"
 "Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of their "
-"mission to help users use non-free add-ons, and may even invite salesmen to "
+"mission to help users use nonfree add-ons, and may even invite salesmen to "
 "come and make sales pitches for them.  They adopt goals such as &ldquo;"
-"helping the users&rdquo; of GNU/Linux (including helping them use non-free "
+"helping the users&rdquo; of GNU/Linux (including helping them use nonfree "
 "applications and drivers), or making the system more popular even at the "
 "cost of freedom."
 msgstr ""
@@ -2233,11 +2266,11 @@
 
"も含めて)といった目標、あるいは、自由が失われようともシステãƒ
 ã‚’人気のあるもの"
 "とするといった目標を掲げています。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The question is how to try to change this."
 msgstr 
"問題は、どのようにしてこれを変えようとするかなのです。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Given that most of the community which uses GNU with Linux already does not "
 "realize that's what it is, for us to disown these adulterated versions, "
@@ -2252,13 +2285,22 @@
 "しょう。かれらは、単に、そのシステム
がGNUであると最初から考えていない、と反応"
 "するだけでしょう。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The way to lead these users to see a connection with freedom is exactly "
+#| "the opposite: to inform them that all these system versions <em>are</em> "
+#| "versions of GNU, that they all are based on a system that exists "
+#| "specifically for the sake of the users' freedom.  With this "
+#| "understanding, they can start to recognize the distributions that include "
+#| "non-free software as perverted, adulterated versions of GNU, instead of "
+#| "thinking they are proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgid ""
 "The way to lead these users to see a connection with freedom is exactly the "
 "opposite: to inform them that all these system versions <em>are</em> "
 "versions of GNU, that they all are based on a system that exists "
 "specifically for the sake of the users' freedom.  With this understanding, "
-"they can start to recognize the distributions that include non-free software "
+"they can start to recognize the distributions that include nonfree software "
 "as perverted, adulterated versions of GNU, instead of thinking they are "
 "proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgstr ""
@@ -2268,7 +2310,7 @@
 
"めたディストリビューションを、邪道なもの、混ぜ物をしたGNUの版と認識することが"
 
"できるのです。正しく適切な「Linuxの版」と考えるのではなくて。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is very useful to start GNU/Linux User Groups, which call the system GNU/"
 "Linux and adopt the ideals of the GNU Project as a basis for their "
@@ -2285,7 +2327,7 @@
 "層的な目標に焦点を当てる人々
は、その見解に関して権利を有しますが、かれらがあ"
 "なたを引きずるようにさせないで!"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not make a GNU distribution of Linux (sic) and call that GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
@@ -2295,7 +2337,7 @@
 "すか?<span class=\"anchor-reference-id\">(<a 
href=\"#gnudist\">#gnudist</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "All the &ldquo;Linux&rdquo; distributions are actually versions of the GNU "
 "system with Linux as the kernel.  The purpose of the term &ldquo;GNU/"
@@ -2309,7 +2351,7 @@
 
"&ldquo;GNU/Linux&rdquo;と呼ぶことはこのわたしたちが明確にしたい点を不明瞭にし"
 "ます。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "As for developing a distribution of GNU/Linux, we already did this once, "
 "when we funded the early development of Debian GNU/Linux.  To do it again "
@@ -2323,7 +2365,7 @@
 
"ビューションが、ほかのディストリビューションよりも本質的な実際の優位性がない"
 "限り、どの目的にも適合しないでしょう。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Instead we help the developers of 100% free GNU/Linux distributions, such as "
 "gNewSense and Ututo."
@@ -2331,7 +2373,7 @@
 
"代わりに、わたしたちはgNewSenseやUtutoのような100%自由なGNU/Linuxディストリ"
 "ビューションの開発を手助けしています。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not just say &ldquo;Linux is the GNU kernel&rdquo; and release some "
 "existing version of GNU/Linux under the name &ldquo;GNU&rdquo;? <span class="
@@ -2341,7 +2383,7 @@
 "GNU&rdquo;の名前でリリースしては?<span 
class=\"anchor-reference-id\">(<a "
 "href=\"#linuxgnu\">#linuxgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It might have been a good idea to adopt Linux as the GNU kernel back in "
 "1992.  If we had realized, then, how long it would take to get the GNU Hurd "
@@ -2351,7 +2393,7 @@
 "せん。もし、GNU 
Hurdが動かすまでどれくらいの時間がかかるかをその時に分かって"
 
"いたら、わたしたちはそうしたでしょう。(ああ、これはあと知恵です。)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we were to take an existing version of GNU/Linux and relabel it as &ldquo;"
 "GNU&rdquo;, that would be somewhat like making a version of the GNU system "
@@ -2363,7 +2405,7 @@
 
"となってしまいます。これは正しいことではありませんから、そのように行動するこ"
 "とはしたくありません。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Did the GNU Project condemn and oppose use of Linux in the early days? <span "
 "class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
@@ -2372,7 +2414,7 @@
 "いですか? <span class=\"anchor-reference-id\">(<a href=\"#condemn"
 "\">#condemn</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We did not adopt Linux as our kernel, but we didn't condemn or oppose it.  "
 "In 1993 we started discussing the arrangements to sponsor the development of "
@@ -2391,7 +2433,7 @@
 
"植性が良くないものでした。取り込むためには、それらは整理するå¿
…要がありまし"
 "た。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who had made the changes showed little interest in cooperating "
 "with us.  One of them actually told us that he didn't care about working "
@@ -2409,7 +2451,7 @@
 "ととしたシステムを開発していた人々
は、わたしたちと仕事をしたくないという最初"
 "の(で、現在も実際には唯一の)グループでした。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It was this experience that first showed us that people were calling a "
 "version of the GNU system &ldquo;Linux&rdquo;, and that this confusion was "
@@ -2423,7 +2465,7 @@
 
"Linux&rdquo;という誤称によって引き起こされるほかの問題へのわたしたちの対応で"
 "す。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why did you wait so long before asking people to use the name GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
@@ -2431,7 +2473,7 @@
 "人々
にGNU/Linuxの名前を使うように求めるのにそんなにも長く待
ったのはなぜです"
 "か?<span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually we didn't.  We began talking privately with developers and "
 "distributors about this in 1994, and made a more public campaign in 1996.  "
@@ -2441,7 +2483,7 @@
 
"1994年にプライベートにこの話を始めました。そして、1996年にå
…¬é–‹ã®ã‚­ãƒ£ãƒ³ãƒšãƒ¼ãƒ³"
 "としました。それが必要な限りわたしたちは続けます。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should the GNU/<i>name</i> convention be applied to all programs that are "
 "GPL'ed? <span class=\"anchor-reference-id\">(<a href=\"#allgpled"
@@ -2450,7 +2492,7 @@
 "GNU/<i>name</i>の慣例はGPLのすべてのプログラム
に適用されるべきですか?<span "
 "class=\"anchor-reference-id\">(<a href=\"#allgpled\">#allgpled</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We never refer to individual programs as &ldquo;GNU/<i>name</i>&rdquo;.  "
 "When a program is a GNU package, we may call it &ldquo;GNU <i>name</"
@@ -2460,7 +2502,7 @@
 "ません。あるプログラム
がGNUパッケージの時、わたしたちはそれを&ldquo;GNU "
 "<i>name</i>&rdquo;と呼びます。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU, the operating system, is made up of many different programs.  Some of "
 "the programs in GNU were written as part of the GNU Project or specifically "
@@ -2472,7 +2514,7 @@
 
"り、プロジェクトへの貢献されたものです。これらはGNUパッケージで、&ldquo;"
 "GNU&rdquo;をしばしばその名前に用います。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It's up to the developers of a program to decide if they want to contribute "
 "it and make it a GNU package.  If you have developed a program and you would "
@@ -2485,7 +2527,7 @@
 "\"mailto:gnu@gnu.org\";>&lt;gnu@gnu.org&gt;</a>まで連絡くだ
さい。わたしたちは"
 "それを評価し、わたしたちにとって必
要かどうか決定します。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It wouldn't be fair to put the name GNU on every individual program that is "
 "released under the GPL.  If you write a program and release it under the "
@@ -2505,7 +2547,7 @@
 
"ジェクトはその謝意を受けることはできませんし、&ldquo;GNU&rdquo;をその名前につ"
 "けることは適切ではないでしょう。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In contrast, we do deserve the overall credit for the GNU operating system "
 "as a whole, even though not for each and every program in it.  The system "
@@ -2517,7 +2559,7 @@
 "る資格があります。このシステムがシステム
として存在するのは、わたしたちの決意"
 "とæ 
¹æ°—ゆえなのです。それは1984年に開始されました。Linuxが始まる何年も前です。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The operating system in which Linux became popular was basically the same as "
 "the GNU operating system.  It was not entirely the same, because it had a "
@@ -2529,7 +2571,7 @@
 "せんが、ほとんど同一のシステム
でした。それはGNUの一種です。GNU/Linuxシステム"
 "でした。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux continues to be used primarily in derivatives of that system&mdash;in "
 "today's versions of the GNU/Linux system.  What gives these systems their "
@@ -2540,7 +2582,7 @@
 "の版にです。これらのシステム
にアイデンティティを与えるのは、その中心であるGNU"
 "とLinuxであり、Linuxそれだけではないのです。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since much of GNU comes from Unix, shouldn't GNU give credit to Unix by "
 "using &ldquo;Unix&rdquo; in its name? <span class=\"anchor-reference-id\">"
@@ -2550,7 +2592,7 @@
 "Unix&rdquo;を使うべきではないですか?<span 
class=\"anchor-reference-id\">(<a "
 "href=\"#unix\">#unix</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Actually, none of GNU comes from Unix.  Unix was proprietary software (and "
 "still is), so using any of its code in GNU would have been illegal.  This is "
@@ -2568,7 +2610,7 @@
 
"コピーすることはできませんでした。すべては新規に書き直されなければならなかっ"
 "たのです。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "No code in GNU comes from Unix, but GNU is a Unix-compatible system; "
 "therefore, many of the ideas and specifications of GNU do come from Unix.  "
@@ -2582,13 +2624,22 @@
 "示すおもしろい方法で、70年代に始まった再帰é 
­è¾žèªžã®ãƒãƒƒã‚«ãƒ¼ã®ä¼çµ±ã«ã—たがって"
 "います。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The first such recursive acronym was TINT, &ldquo;TINT Is Not "
+#| "TECO&rdquo;.  The author of TINT wrote another implementation of TECO "
+#| "(there were already many of them, for various systems), but instead of "
+#| "calling it by a dull name like &ldquo;<em>somethingorother</em> "
+#| "TECO&rdquo;, he thought of a clever amusing name.  (That's what hacking "
+#| "means: <a href=\"http://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
 "The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
 "The author of TINT wrote another implementation of TECO (there were already "
 "many of them, for various systems), but instead of calling it by a dull name "
 "like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of a clever "
-"amusing name.  (That's what hacking means: <a href=\"http://stallman.org/";
+"amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
 "そうした再帰頭辞語の最初は、TINT (&ldquo;TINT Is Not 
TECO&rdquo;)でした。TINT"
@@ -2598,7 +2649,7 @@
 "ち、<a 
href=\"http://stallman.org/articles/on-hacking.html\";>おちゃめな機巧</"
 "a>です。)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Other hackers enjoyed that name so much that we imitated the approach.  It "
 "became a tradition that, when you were writing from scratch a program that "
@@ -2614,7 +2665,7 @@
 
"れと同様の精神で、わたしたちはUnixのわたしたちの代替を&ldquo;GNU's
 Not "
 "Unix&rdquo;と呼んだのです。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Historically, AT&amp;T which developed Unix did not want anyone to give it "
 "credit by using &ldquo;Unix&rdquo; in the name of a similar system, not even "
@@ -2629,7 +2680,7 @@
 "ると脅
しました。すべてのさまざまなUnixの変更版(Unixと同様、すべてプロプライエ"
 "タリです)が完å…
¨ã«ç•°ãªã£ãŸåå‰ã§&ldquo;Unix&rdquo;を含まないのはこのためです。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we say &ldquo;GNU/BSD&rdquo; too? <span class=\"anchor-reference-id\">"
 "(<a href=\"#bsd\">#bsd</a>)</span>"
@@ -2637,7 +2688,7 @@
 "同じく&ldquo;GNU/BSD&rdquo;と言うべきですか? <span 
class=\"anchor-reference-"
 "id\">(<a href=\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems, "
 "because that term does not fit the history of the BSD systems."
@@ -2645,9 +2696,15 @@
 "わたしたちはBSDシステム
(FreeBSD、そのほか)を&ldquo;GNU/BSD&rdquo;システムとは"
 "呼びません。なぜなら、その用語はBSDシステム
の歴史に適合しないからです。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The BSD system was developed by UC Berkeley as non-free software in the "
+#| "80s, and became free in the early 90s.  A free operating system that "
+#| "exists today is almost certainly either a variant of the GNU system, or a "
+#| "kind of BSD system."
 msgid ""
-"The BSD system was developed by UC Berkeley as non-free software in the 80s, "
+"The BSD system was developed by UC Berkeley as nonfree software in the 80s, "
 "and became free in the early 90s.  A free operating system that exists today "
 "is almost certainly either a variant of the GNU system, or a kind of BSD "
 "system."
@@ -2657,7 +2714,7 @@
 "在するものは、ほとんどの場合、GNUシステム
の一種か、BSDシステムの一種のどちら"
 "かです。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "People sometimes ask whether BSD too is a variant of GNU, as GNU/Linux is.  "
 "It is not.  The BSD developers were inspired to make their code free "
@@ -2671,7 +2728,7 @@
 "が(システム
を自由ソフトウェアとすることを)始めるべく説得するのに役立ったで"
 
"しょう。しかし、コードはGNUと重なるところはほとんどありません。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "BSD systems today use some GNU packages, just as the GNU system and its "
 "variants use some BSD programs; however, taken as wholes, they are two "
@@ -2685,7 +2742,7 @@
 "書いてGNUシステムに加
えたのではありませんから、GNU/BSDといった名前は状況に適"
 "さないでしょう。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The connection between GNU/Linux and GNU is much closer, and that's why the "
 "name &ldquo;GNU/Linux&rdquo; is appropriate for it."
@@ -2693,7 +2750,7 @@
 
"GNU/LinuxとGNUのつながりはもっと近く、これが&ldquo;GNU/Linux&rdquo;の名前が適"
 "切である理由です。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is a version of GNU which uses the kernel from NetBSD.  Its developers "
 "call it &ldquo;Debian GNU/NetBSD&rdquo;, but &ldquo;GNU/"
@@ -2707,7 +2764,7 @@
 "ないからです。ほとんどのシステム
がGNU/Linuxと同じですから、これはBSDシステム"
 "ではありません。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "If I install the GNU tools on Windows, does that mean I am running a GNU/"
 "Windows system? <span class=\"anchor-reference-id\">(<a href=\"#othersys"
@@ -2717,7 +2774,7 @@
 "いることになりますか?<span class=\"anchor-reference-id\">(<a 
href=\"#othersys"
 "\">#othersys</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
 "GNU are just a part of the GNU software, which is just a part of the GNU "
@@ -2730,7 +2787,7 @@
 "には、GNUとなんらコードを共有しないもう一つ別の完å…
¨ãªã‚ªãƒšãƒ¬ãƒ¼ãƒ†ã‚£ãƒ³ã‚°ãƒ»ã‚·ã‚¹ãƒ†"
 "ムがあるのです。å…
¨ä½“から見て、GNU/Linuxとはまったく異なった状況です。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can't Linux be used without GNU? <span class=\"anchor-reference-id\">(<a "
 "href=\"#justlinux\">#justlinux</a>)</span>"
@@ -2738,7 +2795,7 @@
 "LinuxはGNUなしで使えないのですか? <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#justlinux\">#justlinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is used by itself, or with small other programs, in some appliances.  "
 "These small software systems are a far cry from the GNU/Linux system.  Users "
@@ -2753,7 +2810,7 @@
 
"けを走らせていると言って、GNU/Linuxとそういう小さいプラットフォーãƒ
 ãŒã©ã®ã‚ˆã†"
 "に異なるかを示すことは有用でしょう。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How much of the GNU system is needed for the system to be GNU/Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
@@ -2761,7 +2818,7 @@
 "システムをGNU/LinuxとするのにどれくらいのGNUシステムが必
要でしょうか? <span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "&ldquo;How much&rdquo; is not a meaningful question because the GNU system "
 "does not have precise boundaries."
@@ -2769,7 +2826,7 @@
 
"「どれくらい」は意味のある質問ではありません。GNUシステãƒ
 ã«ã¯æ­£ç¢ºãªå¢ƒç•ŒãŒãªã„"
 "からです。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is an operating system maintained by a community.  It includes far more "
 "than just the GNU software packages (of which we have a specific list), and "
@@ -2785,7 +2842,7 @@
 "GNUシステム
の一部を使い、一部を除いたとして、「どれくらい」使っているとする意"
 "味のある方法はないでしょう。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we look at the level of packages, Linux is one important package in the "
 "GNU/Linux system.  The inclusion of one important GNU package is enough to "
@@ -2795,7 +2852,7 @@
 
"ケージです。一つの重要なGNUパッケージを含めるのは、わたしたちの同等の言及の要"
 "求を正当化するのに充分でしょう。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Are there complete Linux systems [sic] without GNU? <span class=\"anchor-"
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
@@ -2805,7 +2862,7 @@
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There are complete systems that contain Linux and not GNU; Android is an "
 "example.  But it is a mistake to call them &ldquo;Linux&rdquo; systems, just "
@@ -2815,7 +2872,7 @@
 "しかし、これを&ldquo;Linux&rdquo;システム
と呼ぶことは間違いで、ちょうどGNUを"
 "&ldquo;Linux&rdquo;システムと呼ぶのと同じ間違いです。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android is very different from the GNU/Linux system&mdash;because the two "
 "have very little code in common.  In fact, the only thing they have in "
@@ -2824,7 +2881,7 @@
 "アンドロイドはGNU/Linuxシステム
ととても異なります。二つの間には共通のコードは"
 "少ししかありません。実際、共通にあるのはLinuxだ
けです。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
 "necessary to say things like, &ldquo;Android contains Linux, but it isn't "
@@ -2836,7 +2893,7 @@
 "(GNUシステムを意味する)を有しないからだ」と言う必
要があることを発見するでしょ"
 "う。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android contains just as much of Linux as GNU/Linux does.  What it doesn't "
 "have is the GNU system.  Android replaces that with Google software that "
@@ -2848,7 +2905,7 @@
 
"Googleのソフトウェアで代替します。アンドロイドをGNU/Linuxと変えているのはGNU"
 "の欠如ゆえです。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Is it correct to say &ldquo;using Linux&rdquo; if it refers to using GNU/"
 "Linux and using Android? <span class=\"anchor-reference-id\">(<a href="
@@ -2860,7 +2917,7 @@
 "\"#usegnulinuxandandroidlinuxsyswithoutgnu"
 "\">#usegnulinuxandandroidlinuxsyswithoutgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Far from it.  That usage is so strained that people will not understand the "
 "intended meaning."
@@ -2868,7 +2925,7 @@
 "正解からは、かなり遠
いと言えましょう。その使い方は、かなり引っ張りすぎて、"
 "人々は意図した意味を理解し得ないでしょう。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public will find it very strange to speak of using Android as &ldquo;"
 "using Linux&rdquo;.  It's like having a conversation, then saying you were "
@@ -2878,7 +2935,7 @@
 "に思うでしょう。それは、会話をしてから、ある人のè…
¸ã‹ã€ã¾ãŸã¯ã€ã‚る人の循環系"
 "と会話していた、というようなものです。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public <em>will</em> understand the idea of &ldquo;using Linux&rdquo; "
 "when it's really GNU/Linux, by way of the usual misunderstanding: thinking "
@@ -2888,7 +2945,7 @@
 "通常の誤解(&ldquo;Linux&rdquo;として全体のシステム
をとらえる)で理解<em>してし"
 "まう</em>でしょう。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Use of Android and use of GNU/Linux are totally different, as different as "
 "driving a car and riding a bicycle.  The fact that the first two both "
@@ -2909,7 +2966,7 @@
 
"ととAndroidを使うことを話すのに明確な方法は、「GNU/LinuxとAndroidを使う」で"
 "す。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not call the system &ldquo;Linux&rdquo; anyway, and strengthen Linus "
 "Torvalds' role as posterboy for our community? <span class=\"anchor-"
@@ -2919,7 +2976,7 @@
 
"ためにリーナス・トーバルズの広告塔としての役割を強化すれば良いのでは?<span
 "
 "class=\"anchor-reference-id\">(<a href=\"#helplinus\">#helplinus</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Linus Torvalds is the &ldquo;posterboy&rdquo; (other people's choice of "
 "word, not ours) for his goals, not ours.  His goal is to make the system "
@@ -2937,12 +2994,22 @@
 "とは一度としてありません。これが、å…
¬è¡†ãŒ&ldquo;Linux&rdquo;の名前をその原則と"
 "結びつけることがない理由です。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Linus publicly states his disagreement with the free software movement's "
+#| "ideals.  He developed non-free software in his job for many years (and "
+#| "said so to a large audience at a &ldquo;Linux&rdquo;World show), and "
+#| "publicly invited fellow developers of Linux, the kernel, to use non-free "
+#| "software to work on it with him.  He goes even further, and rebukes "
+#| "people who suggest that engineers and scientists should consider social "
+#| "consequences of our technical work&mdash;rejecting the lessons society "
+#| "learned from the development of the atom bomb."
 msgid ""
 "Linus publicly states his disagreement with the free software movement's "
-"ideals.  He developed non-free software in his job for many years (and said "
+"ideals.  He developed nonfree software in his job for many years (and said "
 "so to a large audience at a &ldquo;Linux&rdquo;World show), and publicly "
-"invited fellow developers of Linux, the kernel, to use non-free software to "
+"invited fellow developers of Linux, the kernel, to use nonfree software to "
 "work on it with him.  He goes even further, and rebukes people who suggest "
 "that engineers and scientists should consider social consequences of our "
 "technical work&mdash;rejecting the lessons society learned from the "
@@ -2956,7 +3023,7 @@
 "な結果について考慮すべきだという人々
を非難しました。原子爆弾の開発から社会が"
 "学んだ教訓を拒否したわけです。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with writing a free program for the motivations of "
 "learning and having fun; the kernel Linus wrote for those reasons was an "
@@ -2975,7 +3042,7 @@
 "しょう、しかし、人々
は問題のオペレーティング・システム
が自由の理想に由来する"
 
"ものであり、かれの見解に由来するものではないと知るべきです。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong for us to label Linus Torvalds' work as GNU? <span class="
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
@@ -2984,7 +3051,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong, so we don't do that.  Torvalds' work is Linux, the "
 "kernel; we are careful not to attribute that work to the GNU Project or "
@@ -2997,7 +3064,7 @@
 "したちが全体のシステム
を語るとき、&ldquo;GNU/Linux&rdquo;の名前は、謝意をかれ"
 "と共有するのです。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Does Linus Torvalds agree that Linux is just the kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
@@ -3006,10 +3073,17 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
+#| "versions/RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are "
+#| "GNU software and are under the GNU copyleft. These tools aren't in the "
+#| "distribution - ask me (or GNU)  for more info&rdquo;</a>."
 msgid ""
 "He recognized this at the beginning.  The earliest Linux release notes said, "
-"<a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"<a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
 "RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are GNU software "
 "and are under the GNU copyleft. These tools aren't in the distribution - ask "
 "me (or GNU)  for more info&rdquo;</a>."
@@ -3020,7 +3094,7 @@
 "ウェアで、GNUコピーレフトの元です。これらのツールはé…
å¸ƒã«ã¯å…¥ã£ã¦ã„ませんの"
 "で、より多くの情報は僕(あるいはGNU)に頼んでくだ
さい。」</a>"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not finish the GNU Hurd kernel, release the GNU system as a whole, and "
 "forget the question of what to call GNU/Linux? <span class=\"anchor-"
@@ -3030,7 +3104,7 @@
 "ぶのはなにかの問題を忘れませんか? <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#finishhurd\">#finishhurd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We would like credit for the GNU operating system no matter which kernel is "
 "used with it."
@@ -3038,13 +3112,20 @@
 
"どのカーネルが使われているにしろ、GNUオペレーティング・システãƒ
 ã«å¯¾ã™ã‚‹ã‚·ãƒ£ã‚¤"
 "を示したいと考えます。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Making the GNU Hurd work well enough to compete with Linux would be a big "
+#| "job, and it's not clearly necessary.  The only thing ethically wrong with "
+#| "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the "
+#| "best fix for that problem is <a href=\"http://fsf.org/campaigns/priority-";
+#| "projects\"> developing free replacement for the blobs</a>."
 msgid ""
 "Making the GNU Hurd work well enough to compete with Linux would be a big "
 "job, and it's not clearly necessary.  The only thing ethically wrong with "
 "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the best "
-"fix for that problem is <a href=\"http://fsf.org/campaigns/priority-projects";
-"\"> developing free replacement for the blobs</a>."
+"fix for that problem is <a href=\"https://www.fsf.org/campaigns/priority-";
+"projects\"> developing free replacement for the blobs</a>."
 msgstr ""
 "GNU HurdをLinuxと競争するに足るに充
分に良くすることは大きな仕事で、明確に必要"
 
"というわけではありません。カーネルとしてのLinuxで倫理上間違っているたった一つ"
@@ -3052,7 +3133,7 @@
 "正は、<a 
href=\"http://fsf.org/campaigns/priority-projects\";>そのブロブの自由"
 "な代替を開発する</a>ことです。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The battle is already lost&mdash;society has made its decision and we can't "
 "change it, so why even think about it? <span class=\"anchor-reference-id\">"
@@ -3062,7 +3143,7 @@
 
"えることはできません。なのに、なぜさらにそれを考えるのですか?
 <span class="
 "\"anchor-reference-id\">(<a href=\"#lost\">#lost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This isn't a battle, it is a campaign of education.  What to call the system "
 "is not a single decision, to be made at one moment by &ldquo;society&rdquo;: "
@@ -3078,7 +3159,7 @@
 "ステム
を呼ぶことを自分自身で決定できます。そしてそうすることは、ほかの人ã€
…ã‚’"
 "教育する手助けとなるのです。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Society has made its decision and we can't change it, so what good does it "
 "do if I say &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id\">(<a "
@@ -3088,7 +3169,7 @@
 
"&ldquo;GNU/Linux&rdquo;と言ってなにかいいことあるのでしょうか?<span
 class="
 "\"anchor-reference-id\">(<a href=\"#whatgood\">#whatgood</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is not an all-or-nothing situation: correct and incorrect pictures are "
 "being spread more or less by various people.  If you call the system &ldquo;"
@@ -3108,7 +3189,7 @@
 "るだけでも、ほんのちょっとの努力で実にたくさんの人々
を教育することができるの"
 "です。そのうちの何人かはほかの人々
に訂正を広めるでしょう。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to call the system &ldquo;Linux&rdquo; and teach "
 "people its real origin with a ten-minute explanation? <span class=\"anchor-"
@@ -3118,7 +3199,7 @@
 "る方が良いのではないでしょうか? <span 
class=\"anchor-reference-id\">(<a href="
 "\"#explain\">#explain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "If you help us by explaining to others in that way, we appreciate your "
 "effort, but that is not the best method.  It is not as effective as calling "
@@ -3129,7 +3210,7 @@
 "ステム
を&ldquo;GNU/Linux&rdquo;と呼ぶことと同じようには効果的ではなく、あなた"
 "の時間を不効率に費やしてしまうでしょう。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is ineffective because it may not sink in, and surely will not "
 "propagate.  Some of the people who hear your explanation will pay attention, "
@@ -3145,7 +3226,7 @@
 
"と呼ぶかもしれません。特に意図がない限り、かれらは間違った絵を広める手助けを"
 "してしまうでしょう。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is inefficient because it takes a lot more time.  Saying and writing "
 "&ldquo;GNU/Linux&rdquo; will take you only a few seconds a day, not minutes, "
@@ -3159,7 +3240,7 @@
 
"に、LinuxとGNU/Linuxの区別をすることは、GNUプロジェクトを効果的に手助けする"
 "もっとも簡単な方法です。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people laugh at you when you ask them to call the system GNU/Linux.  "
 "Why do you subject yourself to this treatment? <span class=\"anchor-"
@@ -3169,7 +3250,7 @@
 
"ます。あなたがこのような扱いを受けるのはなぜでしょうか?
 <span class=\"anchor-"
 "reference-id\">(<a href=\"#treatment\">#treatment</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; tends to give people a mistaken "
 "picture of the system's history and reason for existence.  People who laugh "
@@ -3183,7 +3264,7 @@
 
"よって実現されたと考え、それにわたしたちが謝辞を要求するとき笑うのです。真実"
 "を知れば、おそらく笑わないでしょう。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Why do we take the risk of making a request that sometimes leads people to "
 "ridicule us? Because often it has useful results that help the GNU Project.  "
@@ -3194,7 +3275,7 @@
 
"をしばしばもたらすからです。わたしたちは、わたしたちの目標を達成するために不"
 "当な扱いのリスクを享受します。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you see such an ironically unfair situation occurring, please don't sit "
 "idly by.  Please teach the laughing people the real history.  When they see "
@@ -3204,7 +3285,7 @@
 "い。お願いがなぜ正当とされるのかを人々
が知るとき、見識のある人々は笑うのを止"
 "めるでしょう。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people condemn you when you ask them to call the system GNU/Linux.  "
 "Don't you lose by alienating them? <span class=\"anchor-reference-id\">(<a "
@@ -3214,7 +3295,7 @@
 "す。かれらと仲違いしては損失ではないですか? <span 
class=\"anchor-reference-id"
 "\">(<a href=\"#alienate\">#alienate</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not much.  People who don't appreciate our role in developing the system are "
 "unlikely to make substantial efforts to help us.  If they do work that "
@@ -3231,7 +3312,7 @@
 "誰かに帰するものだとほかの人々
に教えることで、わたしたちのほかの人々の助力を"
 "要請する能力をかれらは削り取っているのです。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It makes no sense to worry about alienating people who are already mostly "
 "uncooperative, and it is self-defeating to be deterred from correcting a "
@@ -3243,7 +3324,7 @@
 "るままでいるのは自滅
です。ですから、わたしたちは誤称を訂正するよう続けるので"
 "す。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Whatever you contributed, is it legitimate to rename the operating system? "
 "<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
@@ -3252,7 +3333,7 @@
 "でしょうか?<span class=\"anchor-reference-id\">(<a 
href=\"#rename\">#rename</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are not renaming anything; we have been calling this system &ldquo;"
 "GNU&rdquo; ever since we announced it in 1983.  The people who tried to "
@@ -3262,7 +3343,7 @@
 "ムをずっと&ldquo;GNU&rdquo;と呼んで来ました。このシステム
を&ldquo;"
 "Linux&rdquo;と改名しようとした人々
は、そうするべきではなかったのです。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong to force people to call the system &ldquo;GNU/Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
@@ -3271,7 +3352,7 @@
 "いでしょうか?<span class=\"anchor-reference-id\">(<a 
href=\"#force\">#force</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong to force them, and we don't try.  We call the system "
 "&ldquo;GNU/Linux&rdquo;, and we ask you to do it too."
@@ -3280,7 +3361,7 @@
 "たしたちはシステム
を&ldquo;GNU/Linux&rdquo;と呼び、あなたもそうしましょうとお"
 "願いします。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not sue people who call the whole system &ldquo;Linux&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
@@ -3288,7 +3369,7 @@
 "&ldquo;Linux&rdquo;と全体のシステムを呼ぶ人々
を訴えてはどうでしょう? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are no legal grounds to sue them, but since we believe in freedom of "
 "speech, we wouldn't want to do that anyway.  We ask people to call the "
@@ -3299,7 +3380,7 @@
 "で、わたしたちは人々にシステム
を&ldquo;GNU/Linux&rdquo;と呼ぶようにお願いしま"
 "す。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Shouldn't you put something in the GNU GPL to require people to call the "
 "system &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id\">(<a href="
@@ -3309,13 +3390,23 @@
 "るべきではないですか?<span class=\"anchor-reference-id\">(<a 
href=\"#require"
 "\">#require</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU GPL is to protect the users' freedom from those "
+#| "who would make proprietary versions of free software.  While it is true "
+#| "that those who call the system &ldquo;Linux&rdquo; often do things that "
+#| "limit the users' freedom, such as bundling non-free software with the GNU/"
+#| "Linux system or even developing non-free software for such use, the mere "
+#| "act of calling the system &ldquo;Linux&rdquo; does not, in itself, deny "
+#| "users their freedom.  It seems improper to make the GPL restrict what "
+#| "name people can use for the system."
 msgid ""
 "The purpose of the GNU GPL is to protect the users' freedom from those who "
 "would make proprietary versions of free software.  While it is true that "
 "those who call the system &ldquo;Linux&rdquo; often do things that limit the "
-"users' freedom, such as bundling non-free software with the GNU/Linux system "
-"or even developing non-free software for such use, the mere act of calling "
+"users' freedom, such as bundling nonfree software with the GNU/Linux system "
+"or even developing nonfree software for such use, the mere act of calling "
 "the system &ldquo;Linux&rdquo; does not, in itself, deny users their "
 "freedom.  It seems improper to make the GPL restrict what name people can "
 "use for the system."
@@ -3328,7 +3419,7 @@
 "は、利用者
の自由を否定するものではありません。GPLがそのシステム
のために人々が"
 
"使える名前を制限することは適切とは言い難いと思われます。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you objected to the original BSD license's advertising requirement to "
 "give credit to the University of California, isn't it hypocritical to demand "
@@ -3340,7 +3431,7 @@
 "でしょうか? <span class=\"anchor-reference-id\">(<a href=\"#BSDlicense"
 "\">#BSDlicense</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would be hypocritical to make the name GNU/Linux a license requirement, "
 "and we don't.  We only <em>ask</em> you to give us the credit we deserve."
@@ -3349,7 +3440,7 @@
 
"ていません。わたしたちは、わたしたちが受けるべき謝意を示すことを<em>お願い</"
 "em>しているだけです。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please note that there are at least <a href=\"/licenses/bsd.html\"> two "
 "different BSD licenses</a>.  For clarity's sake, please don't use the term "
@@ -3359,7 +3450,7 @@
 "ことに注意してくだ
さい。明確にするために、どちらであるか指定せずに「BSDライセ"
 "ンス」という用語を使わないでください。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you failed to put something in the GNU GPL to require people to call "
 "the system &ldquo;GNU&rdquo;, you deserve what happened; why are you "
@@ -3371,7 +3462,7 @@
 "のでしょうか?<span class=\"anchor-reference-id\">(<a href=\"#deserve"
 "\">#deserve</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The question presupposes a rather controversial general ethical premise: "
 "that if people do not force you to treat them fairly, you are entitled to "
@@ -3383,11 +3474,11 @@
 
"い、という考えです。別の言葉で言うと、それが正しいことになる、と仮定していま"
 "す。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope you disagree with that premise just as we do."
 msgstr "わたしたちがそうするようにあなたもその論拠
に反対することを望みます。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't you be better off not contradicting what so many people believe? "
 "<span class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)"
@@ -3397,7 +3488,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't think we should go along with large numbers of people because they "
 "have been misled.  We hope you too will decide that truth is important."
@@ -3406,7 +3497,7 @@
 "たしたちは考えません。あなたも真実が重要だ
と決定するよう、わたしたちは望みま"
 "す。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We could never have developed a free operating system without first denying "
 "the belief, held by most people, that proprietary software was legitimate "
@@ -3416,7 +3507,7 @@
 
"いう確信を、まず否定することなしには、わたしたちは自由のオペレーティング・シ"
 "ステムを開発することができなかったでしょう。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
 "<span class=\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</"
@@ -3426,11 +3517,11 @@
 "とになりませんか? <span class=\"anchor-reference-id\">(<a 
href=\"#somanyright"
 "\">#somanyright</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "We don't think that the popularity of an error makes it the truth."
 msgstr 
"間違いの人口がそれを真実にする、というようにわたしたちは考えません。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it better to call the system by the name most users already know? "
 "<span class=\"anchor-reference-id\">(<a href=\"#knownname\">#knownname</a>)</"
@@ -3440,7 +3531,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#knownname\">#knownname</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo; includes "
 "&ldquo;Linux&rdquo;, they will recognize what you're talking about.  If you "
@@ -3452,7 +3543,7 @@
 "しょう。時々、「(しばしば、誤って&lsquo;Linux&rsquo;と参ç…
§ã•ã‚Œã¾ã™)」と加えれ"
 "ば、ユーザはすべて理解するでしょう。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many people care about what's convenient or who's winning, not about "
 "arguments of right or wrong.  Couldn't you get more of their support by a "
@@ -3464,12 +3555,19 @@
 "せんか?<span class=\"anchor-reference-id\">(<a 
href=\"#winning\">#winning</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+#, fuzzy
+#| msgid ""
+#| "To care only about what's convenient or who's winning is an amoral "
+#| "approach to life.  Non-free software is an example of that amoral "
+#| "approach and thrives on it.  Thus, in the long run it would be self-"
+#| "defeating for us to adopt that approach.  We will continue talking in "
+#| "terms of right and wrong."
 msgid ""
 "To care only about what's convenient or who's winning is an amoral approach "
-"to life.  Non-free software is an example of that amoral approach and "
-"thrives on it.  Thus, in the long run it would be self-defeating for us to "
-"adopt that approach.  We will continue talking in terms of right and wrong."
+"to life.  Nonfree software is an example of that amoral approach and thrives "
+"on it.  Thus, in the long run it would be self-defeating for us to adopt "
+"that approach.  We will continue talking in terms of right and wrong."
 msgstr ""
 "なにが便利で誰が勝っているかだ
けに関心を払うのは、人生において道徳を鑑みない"
 
"やり方でしょう。不自由なソフトウェアはそのような道徳を鑑みないやり方の一例で"
@@ -3477,7 +3575,7 @@
 "るのはわたしたちにとっては自滅
の道でしょう。わたしたちは、正否の観点で論議を"
 "続けます。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope that you are one of those for whom right and wrong do matter."
 msgstr 
"わたしたちは、あなたが正否を問題とする人であることを希望します。"
 
@@ -3523,12 +3621,16 @@
 "README.translations.html\">翻訳 README</a>をご覧ください。"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation, "
+"Inc."
 msgstr ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+"Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -3550,6 +3652,13 @@
 msgid "Updated:"
 msgstr "最終更新:"
 
+#~ msgid ""
+#~ "Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
+#~ "Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
+#~ "Free Software Foundation, Inc."
+
 #~ msgid "GNU/Linux FAQ by Richard Stallman"
 #~ msgstr "リチャード・ストールマンのGNU/Linux FAQ"
 

Index: gnu/po/gnu-linux-faq.ko-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ko-diff.html,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- gnu/po/gnu-linux-faq.ko-diff.html   8 Jun 2021 08:44:38 -0000       1.21
+++ gnu/po/gnu-linux-faq.ko-diff.html   30 Aug 2021 13:34:53 -0000      1.22
@@ -10,35 +10,34 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;GNU/Linux FAQ
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/gnu/po/gnu-linux-faq.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;GNU/Linux FAQ 
by</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;GNU/Linux FAQ&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;GNU/Linux <span class="removed"><del><strong>FAQ 
by</strong></del></span> <span class="inserted"><ins><em>FAQ&lt;/h2&gt;
 
-&lt;address class="byline c"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;</strong></del></span> <span 
class="inserted"><ins><em>Stallman&lt;/address&gt;
+&lt;address class="byline"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;
 
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;To</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;To</em></ins></span> learn more about 
this issue, you can also read
+  &lt;blockquote&gt;&lt;p&gt;To learn more about this issue, you can also read
 our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
Project&lt;/a&gt;, our
  page on &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;
 and our page on &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU
-Users Who Have Never Heard of <span 
class="removed"><del><strong>GNU&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;</strong></del></span>
 <span class="inserted"><ins><em>GNU&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
-&lt;/div&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;
+Users Who Have Never Heard of GNU&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span> <span 
class="inserted"><ins><em>Stallman&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;
 When people see that we use and recommend the name GNU/Linux for a
 system that many others call just &ldquo;Linux&rdquo;, they ask many questions.
 Here are common questions, and our answers.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;div class="toc"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;h3 class="no-display"&gt;Table of Contents&lt;/h3&gt;</em></ins></span>
 &lt;ul&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#why" 
id="TOCwhy"&gt;Why</strong></del></span> <span 
class="inserted"><ins><em>href="#why"&gt;Why</em></ins></span> do you call 
<span class="removed"><del><strong>it</strong></del></span> <span 
class="inserted"><ins><em>the system we use</em></ins></span> GNU/Linux and not 
Linux?&lt;/a&gt;&lt;/li&gt;
@@ -299,7 +298,16 @@
     get more of their support by a different road?&lt;/a&gt;&lt;/li&gt;
 
 &lt;/ul&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;/div&gt;
+
+&lt;div class="announcement comment" role="complementary"&gt;
+&lt;p&gt;To learn more about this issue, you can also read
+our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
System&lt;/a&gt;, our
+ page on &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;
+and our page on &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU
+Users Who Have Never Heard of GNU&lt;/a&gt;.&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;</em></ins></span>
 
 &lt;dl&gt;
 
@@ -340,10 +348,13 @@
 
 &lt;dt <span class="inserted"><ins><em>id="what"&gt;What is the real 
relationship between GNU and Linux? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#what"&gt;#what&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
-&lt;dd&gt;The GNU operating system and the Linux kernel are separate
+&lt;dd&gt;
+&lt;p&gt;
+The GNU operating system and the Linux kernel are separate
 software projects that do complementary jobs.  Typically they are
 packaged in a &lt;a href="/distros/distros.html"&gt;GNU/Linux 
distribution&lt;/a&gt;, and used
-together.&lt;/dd&gt;
+together.&lt;/p&gt;
+&lt;/dd&gt;
 
 &lt;dt</em></ins></span> id="howerror"&gt;How did it come about that most
     people call the system &ldquo;Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#howerror"&gt;#howerror&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
@@ -456,11 +467,12 @@
           support an individual's free speech rights to call the system by
           any name that individual chooses? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#freespeech"&gt;#freespeech&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Yes, indeed, we believe you have a free speech right to call the
 operating system by any name you wish.  We ask that people call it
 GNU/Linux as a matter of doing justice to the GNU project, to promote
 the values of freedom that GNU stands for, and to inform others that
-those values of freedom brought the system into existence.
+those values of freedom brought the system into <span 
class="removed"><del><strong>existence.</strong></del></span> <span 
class="inserted"><ins><em>existence.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="everyoneknows"&gt;Since everyone knows
@@ -491,11 +503,12 @@
     why does it matter what name I use? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#everyoneknows2"&gt;#everyoneknows2&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 If your words don't reflect your knowledge, you don't teach others.
 Most people who have heard of the GNU/Linux system think it is
 &ldquo;Linux&rdquo;, that it was started by Linus Torvalds, and that
 it was intended to be &ldquo;open source&rdquo;.  If you don't tell
-them, who will?
+them, who <span class="removed"><del><strong>will?</strong></del></span> <span 
class="inserted"><ins><em>will?&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="windows"&gt;Isn't shortening &ldquo;GNU/Linux&rdquo;
@@ -602,19 +615,21 @@
 &lt;dt id="brain"&gt;Isn't the kernel the brain of the system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#brain"&gt;#brain&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 A computer system is not much like a human body,
 and no part of it plays a role comparable to that of
-the brain in a human.
+the brain in a <span class="removed"><del><strong>human.</strong></del></span> 
<span class="inserted"><ins><em>human.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="kernelmost"&gt;Isn't writing the kernel most of the work in an
 operating system? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#kernelmost"&gt;#kernelmost&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-No, many components take a lot of work.
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
+No, many components take a lot of <span 
class="removed"><del><strong>work.</strong></del></span> <span 
class="inserted"><ins><em>work.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="nokernel"&gt;An operating system 
requires a kernel.
+&lt;dt id="nokernel"&gt;An operating system requires a kernel.
     Since the GNU Project didn't develop a kernel, how can
     the system be GNU?&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#nokernel"&gt;#nokernel&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -633,10 +648,10 @@
 &lt;p&gt;
 Linus Torvalds made an important contribution to the operating system
 we use; the GNU Project started earlier and contributed much more.
-The name &ldquo;GNU/Linux&rdquo; gives credit to each.&lt;/p&gt;
+The name &ldquo;GNU/Linux&rdquo; gives credit to 
each.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="notinstallable"&gt;How can GNU be an
+&lt;dt id="notinstallable"&gt;How can GNU be an
     operating system, if I can't get something called &ldquo;GNU&rdquo;
     and install it? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#notinstallable"&gt;#notinstallable&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -697,11 +712,12 @@
     feel of Linux&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#feel"&gt;#feel&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 There is no such thing as the &ldquo;feel of Linux&rdquo; because
 Linux has no user interfaces.  Like any modern kernel, Linux is a base
 for running programs; user interfaces belong elsewhere in the system.
 Human interaction with GNU/Linux always goes through other programs,
-and the &ldquo;feel&rdquo; comes from them.
+and the &ldquo;feel&rdquo; comes from <span 
class="removed"><del><strong>them.</strong></del></span> <span 
class="inserted"><ins><em>them.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="long"&gt;The problem with &ldquo;GNU/Linux&rdquo; is that it is too 
long.
@@ -792,7 +808,8 @@
 may simply not recognize we're talking about the same system.  If we
 say &ldquo;GNU/Linux&rdquo;, they can make a connection to what they have heard
 about.&lt;/li&gt;
-&lt;/ul&gt;&lt;p&gt;&lt;/p&gt;
+<span 
class="removed"><del><strong>&lt;/ul&gt;&lt;p&gt;&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/ul&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="trademarkfee"&gt;I would have
@@ -846,11 +863,12 @@
     GNU/systemd/Linux? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#others"&gt;#others&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+&lt;p&gt;
 systemd is a fairly important component, but not as important as the
 kernel (Linux), nor as important as the basis of the system as a whole
 (GNU).  However, if you want to emphasize the presence of systemd
 by calling the system &ldquo;GNU/systemd/Linux&rdquo;, there is nothing
-wrong with doing so.
+wrong with doing so.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt</em></ins></span> id="others"&gt;Many other projects contributed to
@@ -922,8 +940,8 @@
 &lt;p&gt;
 We're not talking about a distinct GNU version of Linux, the kernel.
 The free GNU/Linux distros do have
-a &lt;a href="http://directory.fsf.org/project/linux"&gt;separate version of
-Linux&lt;/a&gt;, since the &ldquo;standard&rdquo; version contains non-free
+a &lt;a <span 
class="removed"><del><strong>href="http://directory.fsf.org/project/linux"&gt;separate</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://directory.fsf.org/wiki/Linux-libre"&gt;separate</em></ins></span>
 version of
+Linux&lt;/a&gt;, since the &ldquo;standard&rdquo; version contains <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
 firmware &ldquo;blobs&rdquo;.  If this were part of the GNU Project,
 it could be considered &ldquo;GNU Linux&rdquo;; but we would not want
 to call it that, because it would be too confusing.&lt;/p&gt;
@@ -1047,13 +1065,13 @@
     free software?  After all, that is the ideal of GNU. &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#reserve"&gt;#reserve&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-The widespread practice of adding non-free software to the GNU/Linux
+The widespread practice of adding <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software to the GNU/Linux
 system is a major problem for our community.  It teaches the users
-that non-free software is ok, and that using it is part of the spirit
+that <span class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software is ok, and that 
using it is part of the spirit
 of &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of 
their mission to
-help users use non-free add-ons, and may even invite salesmen to come
+help users use <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> add-ons, and may even 
invite salesmen to come
 and make sales pitches for them.  They adopt goals such as &ldquo;helping
-the users&rdquo; of GNU/Linux (including helping them use non-free
+the users&rdquo; of GNU/Linux (including helping them use <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
 applications and drivers), or making the system more popular even at
 the cost of freedom.
 &lt;p&gt;
@@ -1071,7 +1089,7 @@
 versions &lt;em&gt;are&lt;/em&gt; versions of GNU, that they all are based on a
 system that exists specifically for the sake of the users' freedom.
 With this understanding, they can start to recognize the distributions
-that include non-free software as perverted, adulterated versions of
+that include <span class="removed"><del><strong>non-free</strong></del></span> 
<span class="inserted"><ins><em>nonfree</em></ins></span> software as 
perverted, adulterated versions of
 GNU, instead of thinking they are proper and appropriate &ldquo;versions of
 Linux&rdquo;.&lt;/p&gt;
 &lt;p&gt;
@@ -1224,7 +1242,7 @@
 (there were already many of them, for various systems), but instead of
 calling it by a dull name like &ldquo;&lt;em&gt;somethingorother&lt;/em&gt; 
TECO&rdquo;, he
 thought of a clever amusing name.  (That's what hacking
-means: &lt;a href="http://stallman.org/articles/on-hacking.html"&gt;playful
+means: &lt;a <span 
class="removed"><del><strong>href="http://stallman.org/articles/on-hacking.html"&gt;playful</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://stallman.org/articles/on-hacking.html"&gt;playful</em></ins></span>
 cleverness&lt;/a&gt;.)&lt;/p&gt;
 &lt;p&gt;
 Other hackers enjoyed that name so much that we imitated the approach.
@@ -1250,7 +1268,7 @@
 We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems,
 because that term does not fit the history of the BSD systems.
 &lt;p&gt;
-The BSD system was developed by UC Berkeley as non-free software in
+The BSD system was developed by UC Berkeley as <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software in
 the 80s, and became free in the early 90s.  A free operating system
 that exists today is almost certainly either a variant of the GNU
 system, or a kind of BSD system.&lt;/p&gt;
@@ -1281,25 +1299,27 @@
 on Windows, does that mean I am running a GNU/Windows system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#othersys"&gt;#othersys&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of 
GNU
 are just a part of the GNU software, which is just a part of the GNU
 system, and underneath them you would still have another complete
 operating system which has no code in common with GNU.  All in all,
-that's a very different situation from GNU/Linux.
+that's a very different situation from <span 
class="removed"><del><strong>GNU/Linux.</strong></del></span> <span 
class="inserted"><ins><em>GNU/Linux.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="justlinux"&gt;Can't Linux be used without GNU? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#justlinux"&gt;#justlinux&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Linux is used by itself, or with small other programs, in some
 appliances.  These small software systems are a far cry from the
 GNU/Linux system.  Users do not install them on PCs, for instance, and
 would find them rather disappointing.  It is useful to say that these
 appliances run just Linux, to show how different those small platforms
-are from GNU/Linux.
+are from <span class="inserted"><ins><em>GNU/Linux.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="howmuch"&gt;How much of the GNU 
system is needed for the system
+&lt;dt id="howmuch"&gt;How much of the GNU system is needed for the system
 to be
 GNU/Linux? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#howmuch"&gt;#howmuch&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -1310,17 +1330,17 @@
 GNU is an operating system maintained by a community.  It includes far
 more than just the GNU software packages (of which we have a specific
 list), and people add more packages constantly.  Despite these
-changes, it remains the GNU system, and adding Linux to that yields
-GNU/Linux.  If you use part of the GNU system and omit part, there is
+changes, it remains the GNU system, and adding Linux to that 
yields</em></ins></span>
+GNU/Linux.  <span class="inserted"><ins><em>If you use part of the GNU system 
and omit part, there is
 no meaningful way to say &ldquo;how much&rdquo; you used.&lt;/p&gt;
 &lt;p&gt;
 If we look at the level of packages, Linux is one important package in
 the GNU/Linux system.  The inclusion of one important GNU package is
 enough to justify our request for equal mention.
-&lt;/p&gt;
+&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="linuxsyswithoutgnu"&gt;Are there complete Linux 
systems [sic] without GNU? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#linuxsyswithoutgnu"&gt;#linuxsyswithoutgnu&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+&lt;dt id="linuxsyswithoutgnu"&gt;Are there complete Linux systems [sic] 
without GNU? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#linuxsyswithoutgnu"&gt;#linuxsyswithoutgnu&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
 There are complete systems that contain Linux and not GNU; Android is
@@ -1400,10 +1420,11 @@
 &ldquo;Linux&rdquo; with that principle.
 &lt;p&gt;
 Linus publicly states his disagreement with the free software
-movement's ideals.  He developed non-free software in his job for many
+movement's ideals.  He developed <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software in his job for many
 years (and said so to a large audience at a &ldquo;Linux&rdquo;World show), and
 publicly invited fellow developers of Linux, the kernel, to use
-non-free software to work on it with him.  He goes even further, and
+<span class="removed"><del><strong>non-free</strong></del></span>
+<span class="inserted"><ins><em>nonfree</em></ins></span> software to work on 
it with him.  He goes even further, and
 rebukes people who suggest that engineers and scientists should
 consider social consequences of our technical work&mdash;rejecting the
 lessons society learned from the development of the atom bomb.&lt;/p&gt;
@@ -1422,11 +1443,13 @@
     work as GNU? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#claimlinux"&gt;#claimlinux&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 It would be wrong, so we don't do that.  Torvalds' work is Linux, the
 kernel; we are careful not to attribute that work to the GNU Project
 or label it as &ldquo;GNU&rdquo;.  When we talk about the whole
 system, the name &ldquo;GNU/Linux&rdquo; gives him a share of the
-credit.
+<span class="removed"><del><strong>credit.</strong></del></span>
+<span class="inserted"><ins><em>credit.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 
@@ -1436,7 +1459,8 @@
 &lt;dd&gt;
 &lt;p&gt;He recognized this at the beginning.  The earliest Linux release notes
 said, &lt;a
-href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+<span 
class="removed"><del><strong>href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
 &ldquo;Most of the tools used with linux are GNU software and are under the
 GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
 for more info&rdquo;&lt;/a&gt;.&lt;/p&gt;
@@ -1454,7 +1478,7 @@
 a big job, and it's not clearly necessary.  The only thing ethically
 wrong with Linux as a kernel is its inclusion of firmware
 &ldquo;blobs&rdquo;; the best fix for that problem
-is &lt;a href="http://fsf.org/campaigns/priority-projects"&gt; developing
+is &lt;a <span 
class="removed"><del><strong>href="http://fsf.org/campaigns/priority-projects"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.fsf.org/campaigns/priority-projects"&gt;</em></ins></span>
 developing
 free replacement for the blobs&lt;/a&gt;.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -1463,12 +1487,13 @@
     it? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#lost"&gt;#lost&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 This isn't a battle, it is a campaign of education.  What to call the
 system is not a single decision, to be made at one moment by
 &ldquo;society&rdquo;: each person, each organization, can decide what
 name to use.  You can't make others say &ldquo;GNU/Linux&rdquo;, but
 you can decide to call the system &ldquo;GNU/Linux&rdquo;
-yourself&mdash;and by doing so, you will help educate others.
+yourself&mdash;and by doing so, you will help educate <span 
class="removed"><del><strong>others.</strong></del></span> <span 
class="inserted"><ins><em>others.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="whatgood"&gt;Society has made its
@@ -1476,6 +1501,7 @@
     &ldquo;GNU/Linux&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#whatgood"&gt;#whatgood&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 This is not an all-or-nothing situation: correct and incorrect
 pictures are being spread more or less by various people.  If you call
 the system &ldquo;GNU/Linux&rdquo;, you will help others learn the system's 
true
@@ -1483,7 +1509,7 @@
 everywhere on your own, any more than we can, but you can help.  If
 only a few hundred people see you use the term &ldquo;GNU/Linux&rdquo;, you 
will
 have educated a substantial number of people with very little work.
-And some of them will spread the correction to others.
+And some of them will spread the correction to <span 
class="removed"><del><strong>others.</strong></del></span> <span 
class="inserted"><ins><em>others.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="explain"&gt;Wouldn't it be better to call
@@ -1554,39 +1580,44 @@
     is it legitimate to rename the operating system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#rename"&gt;#rename&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 We are not renaming anything; we have been calling this system 
&ldquo;GNU&rdquo;
 ever since we announced it in 1983.  The people who tried to rename
-it to &ldquo;Linux&rdquo; should not have done so.&lt;/dd&gt;
+it to &ldquo;Linux&rdquo; should not have done <span 
class="removed"><del><strong>so.&lt;/dd&gt;</strong></del></span> <span 
class="inserted"><ins><em>so.&lt;/p&gt;
+&lt;/dd&gt;</em></ins></span>
 
 &lt;dt id="force"&gt;Isn't it wrong to force people to call
 the system &ldquo;GNU/Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#force"&gt;#force&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 It would be wrong to force them, and we don't try.  We call the system
-&ldquo;GNU/Linux&rdquo;, and we ask you to do it too.
+&ldquo;GNU/Linux&rdquo;, and we ask you to do it <span 
class="removed"><del><strong>too.</strong></del></span> <span 
class="inserted"><ins><em>too.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="whynotsue"&gt;Why not sue people who call
 the whole system &ldquo;Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#whynotsue"&gt;#whynotsue&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 There are no legal grounds to sue them, but since we believe in
 freedom of speech, we wouldn't want to do that anyway.  We ask people
-to call the system &ldquo;GNU/Linux&rdquo; because that is the right thing to 
do.
+to call the system &ldquo;GNU/Linux&rdquo; because that is the right thing to 
<span class="removed"><del><strong>do.</strong></del></span> <span 
class="inserted"><ins><em>do.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="require"&gt;Shouldn't you put something in
     the GNU GPL to require people to call the system &ldquo;GNU&rdquo;? 
&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#require"&gt;#require&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 The purpose of the GNU GPL is to protect the users' freedom from those
 who would make proprietary versions of free software.  While it is
 true that those who call the system &ldquo;Linux&rdquo; often do things that 
limit
-the users' freedom, such as bundling non-free software with the
-GNU/Linux system or even developing non-free software for such use,
+the users' freedom, such as bundling <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software with the
+GNU/Linux system or even developing <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software for such use,
 the mere act of calling the system &ldquo;Linux&rdquo; does not, in itself, 
deny
 users their freedom.  It seems improper to make the GPL restrict what
-name people can use for the system.
+name people can use for the <span 
class="removed"><del><strong>system.</strong></del></span> <span 
class="inserted"><ins><em>system.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="BSDlicense"&gt;Since you objected to the original BSD license's
@@ -1634,17 +1665,19 @@
 it &ldquo;Linux&rdquo;, doesn't that make it right? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#somanyright"&gt;#somanyright&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-We don't think that the popularity of an error makes it the truth.
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
+We don't think that the popularity of an error makes it the <span 
class="removed"><del><strong>truth.</strong></del></span> <span 
class="inserted"><ins><em>truth.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="knownname"&gt;Isn't it better to call the
     system by the name most users already know? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#knownname"&gt;#knownname&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo;
 includes &ldquo;Linux&rdquo;, they will recognize what you're talking
 about.  If you add &ldquo;(often erroneously referred to as
-&lsquo;Linux&rsquo;)&rdquo; once in a while, they will all understand.
+&lsquo;Linux&rsquo;)&rdquo; once in a while, they will all <span 
class="removed"><del><strong>understand.</strong></del></span> <span 
class="inserted"><ins><em>understand.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="winning"&gt;Many people care about what's
@@ -1654,7 +1687,7 @@
 
 &lt;dd&gt;
 To care only about what's convenient or who's winning is an amoral
-approach to life.  Non-free software is an example of that amoral
+approach to life.  <span 
class="removed"><del><strong>Non-free</strong></del></span>  <span 
class="inserted"><ins><em>Nonfree</em></ins></span> software is an example of 
that amoral
 approach and thrives on it.  Thus, in the long run it would be
 self-defeating for us to adopt that approach.  We will continue
 talking in terms of right and wrong.
@@ -1663,8 +1696,7 @@
 &lt;/dd&gt;
 
 &lt;/dl&gt;
-<span class="inserted"><ins><em>&lt;/div&gt;
-&lt;/div&gt;</em></ins></span>
+<span class="inserted"><ins><em>&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;
@@ -1713,7 +1745,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2001, <span class="removed"><del><strong>2006, 2007, 
2008,</strong></del></span> <span 
class="inserted"><ins><em>2006-2008,</em></ins></span> 2010, 2011, 2013, <span 
class="removed"><del><strong>2014, 2015</strong></del></span> <span 
class="inserted"><ins><em>2014-2018, 2020, 2021</em></ins></span>
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>2001, 2006, 2007, 
2008, 2010, 2011, 2013, 2014, 2015</strong></del></span> <span 
class="inserted"><ins><em>2001-2011, 2013-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"
@@ -1724,7 +1756,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/06/08 08:44:38 $
+$Date: 2021/08/30 13:34:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: gnu/po/gnu-linux-faq.ko.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ko.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- gnu/po/gnu-linux-faq.ko.po  7 Apr 2021 18:03:53 -0000       1.29
+++ gnu/po/gnu-linux-faq.ko.po  30 Aug 2021 13:34:53 -0000      1.30
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2016-05-21 13:58+0900\n"
 "Last-Translator: Jongmin Yoon <blueguy@gnu.org>\n"
 "Language-Team: Korean <web-translators-ko@gnu.org>\n"
@@ -20,31 +20,18 @@
 msgid "GNU/Linux FAQ - GNU Project - Free Software Foundation"
 msgstr "GNU/Linux FAQ - GNU 프로젝트 - 자유 소프트웨어 재단"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU/Linux FAQ"
 msgstr ""
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 # | [-GNU/Linux FAQ-]by Richard Stallman
 #, fuzzy
 #| msgid "GNU/Linux FAQ by Richard Stallman"
 msgid "by Richard Stallman"
 msgstr "리차드 스톨반이 작성한 GNU/Linux FAQ"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
-"linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a href=\"/"
-"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"여기에 대해 더 알고 싶다면, <a 
href=\"/gnu/linux-and-gnu.html\">Linux와 GNU "
-"프로젝트</a>에 있는、<a href=\"/gnu/why-gnu-linux.html\">왜 
GNU/Linux 인가?</"
-"a>와、<a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU를 처음 ì 
‘하는 사"
-"람들을위한 문서</a>를 읽어 보세요. "
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When people see that we use and recommend the name GNU/Linux for a system "
 "that many others call just &ldquo;Linux&rdquo;, they ask many questions.  "
@@ -54,6 +41,13 @@
 "또 권하는 것을 보면 사람들이 이것 저것 많이 질문을 
합니다. 많이 묻는 질문과 "
 "그에 대한 우리의 답변을 모아 봤습니다. "
 
+#. type: Content of: <div><div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "목 차"
+
 #. type: Content of: <div><div><ul><li>
 # | <a href=\"#why\">Why do you call [-it-] {+the system we use+} GNU/Linux
 # | and not Linux?</a>
@@ -677,7 +671,33 @@
 "지, 누가 이기는지에 대해 관심이 많습니다.다른 길을 선
택하여 그들의 지원을 더 "
 "많이 받을 수는 없나요?</a>"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
+# | {+System</a>,+} our page on <a href=\"/gnu/why-gnu-linux.html\">Why
+# | GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our page on <a href=\"/"
+#| "gnu/linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a "
+#| "href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
+"linux-and-gnu.html\">Linux and the GNU System</a>, our page on <a href=\"/"
+"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"여기에 대해 더 알고 싶다면, <a 
href=\"/gnu/linux-and-gnu.html\">Linux와 GNU "
+"프로젝트</a>에 있는、<a href=\"/gnu/why-gnu-linux.html\">왜 
GNU/Linux 인가?</"
+"a>와、<a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU를 처음 ì 
‘하는 사"
+"람들을위한 문서</a>를 읽어 보세요. "
+
+#. type: Content of: <div><dl><dt>
 # | Why do you call [-it-] {+the system we use+} GNU/Linux and not Linux?
 # | <span class=\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>
 #, fuzzy
@@ -691,7 +711,7 @@
 "왜 Linux가 아니라 GNU/Linux라고 부르나요? <span 
class=\"anchor-reference-id"
 "\">(<a href=\"#why\">#why</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Most operating system distributions based on Linux as kernel are basically "
 "modified versions of the GNU operating system.  We began developing GNU in "
@@ -708,11 +728,11 @@
 "다. 우리는 대부분의 핵심 요소를 개발했고 전체 시스템에 
가장 큰 단일한 기여를 "
 "했습니다. 기본적인 비전 역시 우리의 것입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "In fairness, we ought to get at least equal mention."
 msgstr "공평성을 위해, 최소한 우리는 동등하게 언급되어야 
합니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and the GNU System</a> and <a "
 "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
@@ -724,7 +744,7 @@
 "gnu-users-never-heard-of-gnu.html\">GNU에 대해 알지 못하는 GNU 
사용자</a>를 "
 "읽어보세요."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why is the name important? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
@@ -732,7 +752,7 @@
 "왜 이름이 중요한가요? <span class=\"anchor-reference-id\">(<a 
href=\"#whycare"
 "\">#whycare</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Although the developers of Linux, the kernel, are contributing to the free "
 "software community, many of them do not care about freedom.  People who "
@@ -746,7 +766,7 @@
 "로 하지 않은 역할을 부여하려고 합니다. 그 다음에는 그 
개발자들의 관점에 터무"
 "니 없는 무게를 둡니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Calling the system GNU/Linux recognizes the role that our idealism played in "
 "building our community, and <a href=\"/gnu/why-gnu-linux.html\">helps the "
@@ -757,7 +777,7 @@
 "linux.html\">대중들에게 이 이상의 실용적인 중요성에 
대해서 인식하도록 도울 "
 "수 있습니다.</a>。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Why do you call it GNU/Linux-]{+What is the real relationship between
 # | GNU+} and [-not-] Linux? <span class=\"anchor-reference-id\">(<a
 # | [-href=\"#why\">#why</a>)</span>-] {+href=\"#what\">#what</a>)</span>+}
@@ -772,14 +792,14 @@
 "왜 Linux가 아니라 GNU/Linux라고 부르나요? <span 
class=\"anchor-reference-id"
 "\">(<a href=\"#why\">#why</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU operating system and the Linux kernel are separate software projects "
 "that do complementary jobs.  Typically they are packaged in a <a href=\"/"
 "distros/distros.html\">GNU/Linux distribution</a>, and used together."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How did it come about that most people call the system &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
@@ -788,7 +808,7 @@
 "왜 대부분의 사람들이 &ldquo;Linux&rdquo;라고 부르나요? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#howerror\">#howerror</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; is a confusion that has spread faster "
 "than the corrective information."
@@ -796,7 +816,7 @@
 "&ldquo;Linux&rdquo;라고 부르는 것은 정확한 정보보다 더 빠
르게 퍼진 혼동입니"
 "다. "
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who combined Linux with the GNU system were not aware that that's "
 "what their activity amounted to.  They focused their attention on the piece "
@@ -813,7 +833,7 @@
 "을 알고 사람들에게 Linux라고 부르는 버릇을 고쳐달라고 
부탁했습니다. 그 때부"
 "터 문제는 커지기 시작했습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the people who call the system &ldquo;Linux&rdquo; have never heard "
 "why that's not the right thing.  They saw others using that name and assume "
@@ -831,7 +851,7 @@
 "을 시작했다고 믿고는 합니다. 이 잘못된 그림은 
&ldquo;Linux&rdquo;라고 불러야 "
 "한다는 잘못된 생각을 강화하기 쉽습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Many of the questions in this file represent people's attempts to justify "
 "the name they are accustomed to using."
@@ -839,7 +859,7 @@
 "이 파일에 있는 질문 중에는 사람들이 자기들에게 익숙한 
이름을 정당화하려는 의"
 "도를 나타낸 것이 많습니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we always say &ldquo;GNU/Linux&rdquo; instead of &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
@@ -847,7 +867,7 @@
 "&ldquo;Linux&rdquo; 대신 항상 &ldquo;GNU/Linux&rdquo;라고 불러야 
하나요?"
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not always&mdash;only when you're talking about the whole system.  When "
 "you're referring specifically to the kernel, you should call it &ldquo;"
@@ -857,7 +877,7 @@
 "면 됩니다. 커널만을 언급할 때는 커널 개발자가 고른 
이름인 &ldquo;Linux&rdquo;"
 "라고 불러야 합니다. "
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
 "call the whole system by the same name as the kernel.  This causes many "
@@ -872,7 +892,7 @@
 "다. 전체 시스템을 &ldquo;GNU/Linux&rdquo;로, 커널을 
&ldquo;Linux&rdquo;로 부"
 "름으로써 모호함을 피할 수 있습니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Would Linux have achieved the same success if there had been no GNU? <span "
 "class=\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</"
@@ -881,7 +901,7 @@
 "GNU가 없었어도 Linux가 같은 성공을 거두었을까요?<span 
class=\"anchor-"
 "reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In that alternative world, there would be nothing today like the GNU/Linux "
 "system, and probably no free operating system at all.  No one attempted to "
@@ -894,7 +914,7 @@
 "에) 버클리 CSRG 빼고는 아무도 자유 운영체제를 개발하려고
 하지 않았습니다. "
 "GNU 프로젝트는 특히 버클리 CSRG에 CSRG 코드를 자유롭게 
풀라고 요구했었습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds was partly influenced by a speech about GNU in Finland in "
 "1990.  It's possible that even without this influence he might have written "
@@ -908,7 +928,7 @@
 "가 그것을 GNU GPL로 발표한 1992년 자유로워졌습니다(0.12 
판의 발표문을 보세"
 "요)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Even if Torvalds had released Linux under some other free software license, "
 "a free kernel alone would not have made much difference to the world.  The "
@@ -920,7 +940,7 @@
 "더 큰 프레임워크, 즉 완전한 자유 운영체제인 GNU/Linux에 
잘 들어맞았다는 데 있"
 "습니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better for the community if you did not divide people with "
 "this request? <span class=\"anchor-reference-id\">(<a href=\"#divide"
@@ -929,7 +949,7 @@
 "이 요구로 사람들을 편가르지 않는 게 커뮤니티에 더 좋지 
않을까요?<span class="
 "\"anchor-reference-id\">(<a href=\"#divide\">#divide</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
 "people.  We are asking them to give the GNU Project credit for the GNU "
@@ -940,7 +960,7 @@
 "인정해 달라고 부탁하는 것입니다. 이것은 누군가를 
비판하거나 밀어내는 것이 아"
 "닙니다. "
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, there are people who do not like our saying this.  Sometimes those "
 "people push us away in response.  On occasion they are so rude that one "
@@ -954,7 +974,7 @@
 "묵하게 할 수 없습니다. 그러나 그 때문에 커뮤니티가 
분열됩니다. 따라서 우리는 "
 "여러분이 그들이 그러지 못하게 납득을 시켜주기를 
바랍니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, this is only a secondary cause of division in our community.  The "
 "largest division in the community is between people who appreciate free "
@@ -969,7 +989,7 @@
 "하고 자유 소프트웨어를 효율적인 개발 본보기로만 
소개하는 사람들 (오픈 소스 운"
 "동) 사이의 분열입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This disagreement is not just a matter of names&mdash;it is a matter of "
 "differing basic values.  It is essential for the community to see and think "
@@ -984,7 +1004,7 @@
 "지입니다.<a href=\"/philosophy/open-source-misses-the-point.html\">왜 
자유 소"
 "프트웨어가 오픈 소스보다 좋은가?</a>를 보세요."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The disagreement over values partially aligns with the amount of attention "
 "people pay to the GNU Project's role in our community.  People who value "
@@ -1007,7 +1027,7 @@
 "모든 사람을 설득하거나 (쉽지 않을 것입니다) 우리가 완ì 
„히 지면(그러지 않기를 "
 "바랍니다) 사라질 것입니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Doesn't the GNU project support an individual's free speech rights to call "
 "the system by any name that individual chooses? <span class=\"anchor-"
@@ -1017,7 +1037,7 @@
 "하지 않는 건가요?<span class=\"anchor-reference-id\">(<a 
href=\"#freespeech"
 "\">#freespeech</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Yes, indeed, we believe you have a free speech right to call the operating "
 "system by any name you wish.  We ask that people call it GNU/Linux as a "
@@ -1031,7 +1051,7 @@
 "가치를 널리 알리고 자유의 가치 덕분에 자유 운영체제를 
실현됐다는 것을 알리려"
 "는 것입니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | Since everyone knows [-GNU's-] {+the+} role {+of GNU+} in developing the
 # | system, doesn't the &ldquo;GNU/&rdquo; in the name go without saying?
 # | <span class=\"anchor-reference-id\">(<a
@@ -1050,7 +1070,7 @@
 "&rdquo;는 없어도 되지 않을까요?<span 
class=\"anchor-reference-id\">(<a href="
 "\"#everyoneknows\">#everyoneknows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Experience shows that the system's users, and the computer-using public in "
 "general, often know nothing about the GNU system.  Most articles about the "
@@ -1064,7 +1084,7 @@
 "않습니다.<a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU를 처음 
접하"
 "는 사람들을 위한 문서</a>에서 더 자세한 것을 보실 수 
있습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who say this are probably geeks thinking of the geeks they know.  "
 "Geeks often do know about GNU, but many have a completely wrong idea of what "
@@ -1077,7 +1097,7 @@
 "구&rdquo;</a>모음으로 생각하거나 도구를 개발하는 프로ì 
íŠ¸ë¡œ 생각하는 사람이 "
 "많습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The wording of this question, which is typical, illustrates another common "
 "misconception.  To speak of &ldquo;GNU's role&rdquo; in developing something "
@@ -1091,7 +1111,7 @@
 "역할에 대해 이야기하는 것은 말이 되지만 사람들의 
모임으로 GNU를 언급하는 것"
 "은 말이 안됩니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since I know the role of GNU in this system, why does it matter what name I "
 "use? <span class=\"anchor-reference-id\">(<a href="
@@ -1101,7 +1121,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#everyoneknows2\">#everyoneknows2</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your words don't reflect your knowledge, you don't teach others.  Most "
 "people who have heard of the GNU/Linux system think it is &ldquo;"
@@ -1113,7 +1133,7 @@
 "작된, &ldquo;오픈 소스&rdquo;로 여겨진 &ldquo;Linux&rdquo;라고 
생각합니다. 당"
 "신이 아무에게도 말하지 않는다면 누가 알 수 있을까요?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't shortening &ldquo;GNU/Linux&rdquo; to &ldquo;Linux&rdquo; just like "
 "shortening &ldquo;Microsoft Windows&rdquo; to &ldquo;Windows&rdquo;? <span "
@@ -1124,7 +1144,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#windows\">#windows</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It's useful to shorten a frequently-used name, but not if the abbreviation "
 "is misleading."
@@ -1132,7 +1152,7 @@
 "자주 쓰는 이름을 줄이는 것은 유용하기는 하지만 약어가 
오해를 일으킨다면 그렇"
 "지 않습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Almost everyone in developed countries really does know that the &ldquo;"
 "Windows&rdquo; system is made by Microsoft, so shortening &ldquo;Microsoft "
@@ -1146,7 +1166,7 @@
 "다. &ldquo;GNU/Linux&rdquo;를 &ldquo;Linux&rdquo;로 줄이는 것은 
잘못된 개념"
 "을 줍니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The question is itself misleading because GNU and Microsoft are not the same "
 "kind of thing.  Microsoft is a company; GNU is an operating system."
@@ -1154,7 +1174,7 @@
 "질문 자체가 오해를 일으킵니다. 왜냐하면 GNU와 Microsoft는 
같은 종류의 대상이 "
 "아니기 때문입니다. Microsoft는 회사이고 GNU는 운영체제입
니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't GNU a collection of programming tools that were included in Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
@@ -1162,7 +1182,7 @@
 "GNU는 Linu에 포함된 프로그래밍 도구 모음 아닌가요?<span 
class=\"anchor-"
 "reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "People who think that Linux is an entire operating system, if they hear "
 "about GNU at all, often get a wrong idea of what GNU is.  They may think "
@@ -1178,7 +1198,7 @@
 "이 유명해졌기 때문입니다. &ldquo;GNU&rdquo;가 운영체제의 
이름이라는 생각은 운"
 "영체제를 &ldquo;Linux&rdquo;라 명명한 개념 틀에는 맞추기 어ë 
µìŠµë‹ˆë‹¤."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Project was named after the GNU operating system&mdash;it's the "
 "project to develop the GNU system.  (See <a href=\"/gnu/initial-announcement."
@@ -1188,7 +1208,7 @@
 "를 만드는 프로젝트입니다.(<a 
href=\"/gnu/initial-announcement.html\">1983년"
 "의 최초 발표문</a>를 보세요.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We developed programs such as GCC, GNU Emacs, GAS, GLIBC, BASH, etc., "
 "because we needed them for the GNU operating system.  GCC, the GNU Compiler "
@@ -1202,7 +1222,7 @@
 "람들은 또한 GNU 운영체제를 위해 고스트스크립트, GNUCash, 
GNU 체스, GNOME 등"
 "을 개발했습니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the difference between an operating system and a kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
@@ -1210,7 +1230,7 @@
 "운영체제와 커널의 차이는 무엇인가요?<span 
class=\"anchor-reference-id\">(<a "
 "href=\"#osvskernel\">#osvskernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "An operating system, as we use the term, means a collection of programs that "
 "are sufficient to use the computer to do a wide variety of jobs.  A general "
@@ -1221,7 +1241,7 @@
 "는 데 충분한 프로그램 모음을 의미합니다. 범용 운영체ì 
œëŠ” 완전해지려면 많은 사"
 "용자가 하기를 바라는 일을 전부 다룰 수 있어야 합니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The kernel is one of the programs in an operating system&mdash;the program "
 "that allocates the machine's resources to the other programs that are "
@@ -1230,7 +1250,7 @@
 "커널은 운영체제 프로그램의 하나로 기계 자원을 다른 
프로그램에 할당하는 프로그"
 "램입니다. 커널은 또한 다른 프로그램을 시작하고 멈추게 
합니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "To confuse matters, some people use the term &ldquo;operating system&rdquo; "
 "to mean &ldquo;kernel&rdquo;.  Both uses of the term go back many years.  "
@@ -1250,7 +1270,7 @@
 "운영체제로 의도했기 때문에 &ldquo;운영체제&rdquo;라는 
용어를 같은 방식으로 씁"
 "니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the time when people speak of the &ldquo;Linux operating "
 "system&rdquo; they are using &ldquo;operating system&rdquo; in the same "
@@ -1267,7 +1287,7 @@
 "가 정확한 이름입니다. 그러나 여러분이 의미하는 게 
소프트웨어의 어느 부분에 대"
 "한 것인지 모호함을 피하기 위해 &ldquo;커널&rdquo;이라고 
말해주세요."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
@@ -1278,7 +1298,7 @@
 "&rdquo; 같은 용어를 쓰는 것을 더 좋아한다면 그것도 
좋습니다. 그러면 GNU/"
 "Linux 시스템 배포판들이라고 말할 수 있겠네요."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The kernel of a system is like the foundation of a house.  How can a house "
 "be almost complete when it doesn't have a foundation? <span class=\"anchor-"
@@ -1288,7 +1308,7 @@
 "수 있을까요?<span class=\"anchor-reference-id\">(<a 
href=\"#house\">#house</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "A kernel is not much like the foundation of a house because building an "
 "operating system is not much like building a house."
@@ -1296,7 +1316,7 @@
 "커널은 기반과 크게 같지 않습니다. 왜냐하면 운영체제를 
만드는 것은 집 짓는 것"
 "과 같지 않거든요."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A house is built from lots of little general parts that are cut and put "
 "together in situ.  They have to be put together from the bottom up.  Thus, "
@@ -1307,7 +1327,7 @@
 "에서부터 차례대로 끼워맞춰져야 하죠. 그러므로, 기반이 
만들어지지 않았다면 튼"
 "튼한 구성품이 만들어질 수 없습니다. 당신이 가진거라곤 
흙구덩이 뿐이죠."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "By contrast, an operating system consists of complex components that can be "
 "developed in any order.  When you have developed most of the components, "
@@ -1322,7 +1342,7 @@
 "다.만약 대부분의 우주정거장의 모듈들이 궤도에 있고 
다른 기본 모듈들이 만들어"
 "지길 기다린다면, 그것이 바로 1992년에 GNU의 모습과 비슷할
 것입니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't the kernel the brain of the system? <span class=\"anchor-reference-id"
 "\">(<a href=\"#brain\">#brain</a>)</span>"
@@ -1330,7 +1350,7 @@
 "커널은 시스템의 중추적인 부분이 아닌가요?<span 
class=\"anchor-reference-id\">"
 "(<a href=\"#brain\">#brain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A computer system is not much like a human body, and no part of it plays a "
 "role comparable to that of the brain in a human."
@@ -1338,7 +1358,7 @@
 "컴퓨터시스템은 신체와 비슷하지 않습니다. 그리고 어떠
한 컴퓨터의 부분 또한 인"
 "간의 뇌로 치자면 그와 비슷한 기능을 할 수 없습니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't writing the kernel most of the work in an operating system? <span "
 "class=\"anchor-reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</"
@@ -1347,11 +1367,11 @@
 "운영체제를 만들 때 커널 관련 작업이 대부분이지 
않나요?<span class=\"anchor-"
 "reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "No, many components take a lot of work."
 msgstr "아니요. 많은 많은 작업을 수행하는 다양한 구성으로 
이루어집니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Isn't writing-]{+An operating system requires a kernel.  Since+} the
 # | [-kernel most of-] {+GNU Project didn't develop a kernel, how can+} the
 # | [-work in an operating system? <span-] {+system be GNU?<span+}
@@ -1371,7 +1391,7 @@
 "운영체제를 만들 때 커널 관련 작업이 대부분이지 
않나요?<span class=\"anchor-"
 "reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The people who argue that way for calling the system &ldquo;Linux&rdquo; are "
 "using a double standard.  An operating system requires compilers, editors, "
@@ -1380,20 +1400,20 @@
 "any of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "That standard is too strict, not the right way to judge the contributions of "
 "any contributor."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds made an important contribution to the operating system we "
 "use; the GNU Project started earlier and contributed much more.  The name "
 "&ldquo;GNU/Linux&rdquo; gives credit to each."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How can GNU be an operating system, if I can't get something called &ldquo;"
 "GNU&rdquo; and install it? <span class=\"anchor-reference-id\">(<a href="
@@ -1403,7 +1423,7 @@
 "수 있나요?<span class=\"anchor-reference-id\">(<a href=\"#notinstallable"
 "\">#notinstallable</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Many <a href=\"/distros/distros.html\"> packaged and installable versions of "
 "GNU</a> are available.  None of them is called simply &ldquo;GNU&rdquo;, but "
@@ -1412,7 +1432,7 @@
 "많은<a href=\"/distros/distros.html\">패키지화된 설치가능한 GNU 
버전</a>들이 "
 "가능합니다. "
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We expected to release the GNU system packaged for installation, but this "
 "plan was overtaken by events: in 1992 others were already packaging GNU "
@@ -1432,7 +1452,7 @@
 "르도록 요구하지 않았습니다. 왜냐하면 그 때 당시 준비가 
안됬던 GNU Hurd 커널"
 "의 이름이 되었기 때문입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Hurd kernel never became sufficiently ready; we only recommend it to "
 "those interested in working on it.  So we never packaged GNU with the GNU "
@@ -1442,7 +1462,7 @@
 "심을 가졌던 이들에게만 추천을 했습니다. 그래서 우리는 
GNU Hurd 커널을 GNU에 "
 "패키지하지 않았습니다. 하지만 Debian은 이를 Debian 
GNU/Hurd로 패키지하였죠."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are now developing an advanced Scheme-based package manager called Guix "
 "and a complete system distribution based on it called the <a href=\"/"
@@ -1453,7 +1473,7 @@
 "software/guix\">Guix 시스템 배포판</a>(GuixSD)을 개발중에 
있습니다.이는 GNU"
 "의 실질적인 부분을 리패키징하는 것을 포함합니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We never took the last step of packaging GNU under the name &ldquo;"
 "GNU&rdquo;, but that doesn't alter what kind of thing GNU is.  GNU is an "
@@ -1463,7 +1483,7 @@
 "않았습니다. 그러나 그것은 GNU가 무엇인지를 변화시키지 
않습니다. GNU는 운영체"
 "제입니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "We're calling the whole system after the kernel, Linux.  Isn't it normal to "
 "name an operating system after a kernel? <span class=\"anchor-reference-id\">"
@@ -1473,7 +1493,7 @@
 "이름을 짓는 게 일반적이지 않나요?<span 
class=\"anchor-reference-id\">(<a "
 "href=\"#afterkernel\">#afterkernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "That practice seems to be very rare&mdash;we can't find any examples other "
 "than the misuse of the name &ldquo;Linux&rdquo;.  Normally an operating "
@@ -1488,7 +1508,7 @@
 "습니다. 사람들은 &ldquo;무엇의 커널&rdquo;이나 &ldquo;무슨 
무슨 커널&rdquo;이"
 "라고 말합니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Because those two constructions are used synonymously, the expression &ldquo;"
 "the Linux kernel&rdquo; can easily be misunderstood as meaning &ldquo;the "
@@ -1502,7 +1522,7 @@
 "&ldquo;커널, Linux&rdquo; 혹은 &ldquo;Linux, 커널&rdquo;고 
말하거나 글로 써"
 "서 발생하는 오해의 가능성을 피해야 합니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can another system have &ldquo;the feel of Linux&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
@@ -1510,7 +1530,7 @@
 "&ldquo;Linux와 유사한&rdquo; 운영체제가 있나요?<span 
class=\"anchor-"
 "reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is no such thing as the &ldquo;feel of Linux&rdquo; because Linux has "
 "no user interfaces.  Like any modern kernel, Linux is a base for running "
@@ -1523,7 +1543,7 @@
 "다; UI는 다른 시스템에 속합니다. GNU/Linux의 사용자와의 
상호작용은 언제나 다"
 "른 프로그램들로 행해집니다 그리고 그것들로부터 &ldquo;유
사함&rdquo;이 옵니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  How about "
 "recommending a shorter name? <span class=\"anchor-reference-id\">(<a href="
@@ -1533,7 +1553,7 @@
 "게 어때요?<span class=\"anchor-reference-id\">(<a 
href=\"#long\">#long</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "For a while we tried the name &ldquo;LiGNUx&rdquo;, which combines the words "
 "&ldquo;GNU&rdquo; and &ldquo;Linux&rdquo;.  The reaction was very bad.  "
@@ -1543,7 +1563,7 @@
 "는 이름을 써보려 했습니다. 반응이 매우 나빴습니다. 
사람들은 &ldquo;GNU/"
 "Linux&rdquo;를 더 좋아했습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
 "call it &ldquo;GNU/Linux&rdquo; <a href=\"#justgnu\"> for the reasons given "
@@ -1552,7 +1572,7 @@
 "이 시스템을 위한 가장 짧고 합리적인 이름은 
&ldquo;GNU&rdquo;이지만, 다음과 같"
 "은 이유로 &ldquo;GNU/Linux&rdquo;라 부릅니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Why do you write &ldquo;GNU/Linux&rdquo; instead-]{+How about calling
 # | the system &ldquo;GliNUx&rdquo; (instead+} of [-&ldquo;GNU Linux&rdquo;?-]
 # | {+&ldquo;GNU/Linux&rdquo;)?+} <span class=\"anchor-reference-id\">(<a
@@ -1571,7 +1591,7 @@
 "왜 &ldquo;GNU Linux&rdquo;대신 &ldquo;GNU/Linux&rdquo;라고 
쓰나요?<span "
 "class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The name &ldquo;GNU&rdquo; does not visibly appear in &ldquo;Glinux,&rdquo; "
 "so most people would not notice it is there.  Even if it is capitalized as "
@@ -1579,13 +1599,13 @@
 "reference to GNU."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be comparable to writing &ldquo;GNU/Linux,&rdquo; but putting "
 "&ldquo;GNU/&rdquo; in print so small that most people could not read it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  Why should "
 "I go to the trouble of saying &ldquo;GNU/&rdquo;? <span class=\"anchor-"
@@ -1595,7 +1615,7 @@
 "고 부르면 안 되나요?<span class=\"anchor-reference-id\">(<a href="
 "\"#long2\">#long2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
 "the system that we developed, can't you take one second to recognize our "
@@ -1605,7 +1625,7 @@
 "리가 만든 시스템에 감사하게 느낀다면, 그냥 몇 초 더 
써서 우리의 결과물을 인정"
 "해주면 안되나요?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Unfortunately, &ldquo;GNU/Linux&rdquo; is five syllables. People won't use "
 "such a long term. Shouldn't you find a shorter one? <span class=\"anchor-"
@@ -1615,7 +1635,7 @@
 "용하길 원치 않아요. 짧은 이름을 사용하는 것은 
어떨까요?<span class=\"anchor-"
 "reference-id\">(<a href=\"#long3\">#long3</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, &ldquo;GNU/Linux&rdquo; is only four syllables.  &ldquo;"
 "Unfortunately&rdquo; is five syllables, yet people show no sign of "
@@ -1625,7 +1645,7 @@
 "Unfortunately&rdquo;는 5음절뿐이죠. 그런데 사람들은 이 
단어를 사용하는데 전"
 "혀 불편을 느끼지 않습니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Why do you write-]{+Stallman doesn't ask us to call him &ldquo;Richard
 # | Matthew Stallman&rdquo; every the time.  So why ask us to say+}
 # | &ldquo;GNU/Linux&rdquo; [-instead of &ldquo;GNU Linux&rdquo;?-] {+every
@@ -1645,21 +1665,21 @@
 "왜 &ldquo;GNU Linux&rdquo;대신 &ldquo;GNU/Linux&rdquo;라고 
쓰나요?<span "
 "class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Omitting &ldquo;Matthew&rdquo; does not misrepresent anything important "
 "about Stallman's nature, origin, ideas or purpose.  Omitting &ldquo;"
 "GNU&rdquo; does misrepresent those things about the GNU/Linux system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is an example of a frequent way of hiding a fallacy: to bury it inside "
 "a misleading analogy.  A better analogy would be, &ldquo;Why shouldn't we "
 "call Stallman &lsquo;Torvalds&rsquo;?&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since Linux is a secondary contribution, would it be false to the facts to "
 "call the system simply &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id"
@@ -1669,7 +1689,7 @@
 "나요?<span class=\"anchor-reference-id\">(<a 
href=\"#justgnu\">#justgnu</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would not be false to the facts, but it is not the best thing to do.  "
 "Here are the reasons we call that system version &ldquo;GNU/Linux&rdquo; "
@@ -1678,7 +1698,7 @@
 "잘못된 것은 아니지만 가장 좋은 것도 아닙니다. 우리가 
그냥 &ldquo;GNU&rdquo;"
 "가 아니라 &ldquo;GNU/Linux&rdquo;라고 부르는 이유는 다음과 
같습니다:"
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It's not exactly GNU&mdash;it has a different kernel (that is, Linux).  "
 "Distinguishing GNU/Linux from GNU is useful."
@@ -1686,7 +1706,7 @@
 "그것은 엄밀히 말해 GNU가 아닙니다. 그것은 다른 커널(즉 
Linux)을 갖고 있습니"
 "다. GNU/Linux와 GNU를 구별하는 것은 유용합니다."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It would be ungentlemanly to ask people to <em>stop</em> giving any credit "
 "to Linus Torvalds.  He did write an important component of the system.  We "
@@ -1705,7 +1725,7 @@
 "리는 이 불일치를 시스템에 대한 그의 기여를 깎아 
내리기보다는 올바르고 공개적"
 "으로 다룰 것입니다."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
 "&ldquo;GNU&rdquo; they may simply not recognize we're talking about the same "
@@ -1717,7 +1737,7 @@
 "리가 &ldquo;GNU/Linux&rdquo;라고 하면 그들이 들은 것과 연관을 
지을 수 있습니"
 "다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "I would have to pay a fee if I use &ldquo;Linux&rdquo; in the name of a "
 "product, and that would also apply if I say &ldquo;GNU/Linux&rdquo;.  Is it "
@@ -1731,7 +1751,7 @@
 "까요?<span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There's nothing wrong in calling the system &ldquo;GNU&rdquo;; basically, "
 "that's what it is.  It is nice to give Linus Torvalds a share of the credit "
@@ -1741,7 +1761,7 @@
 "리누스 토발즈에게 기여의 몫을 주는 것은 좋습니다. 
하지만 반드시 그렇게 해야"
 "만 하는 의무가 있는 것은 아닙니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "So if you want to refer to the system simply as &ldquo;GNU&rdquo;, to avoid "
 "paying the fee for calling it &ldquo;Linux&rdquo;, we won't criticize you."
@@ -1749,7 +1769,7 @@
 "따라서 &ldquo;Linux&rdquo;라고 부르는 것에 대한 비용을 내지 
않으려고 그냥 "
 "&ldquo;GNU&rdquo;라 부르고 싶다면 우리는 비난하지 않을 것입
니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today; it includes "
 "TeX, X11, Apache, Perl, and many more programs.  Don't your arguments imply "
@@ -1763,7 +1783,7 @@
 "게 길어질 텐데요)<span class=\"anchor-reference-id\">(<a href=\"#many"
 "\">#many</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "What we say is that you ought to give the system's principal developer a "
 "share of the credit.  The principal developer is the GNU Project, and the "
@@ -1772,7 +1792,7 @@
 "우리의 말은 시스템의 주요 개발자의 기여를 인정해야 
한다는 것이었습니다. 주요 "
 "개발자는 GNU 프로젝트이고 시스템은 기본적으로 GNU입
니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you feel even more strongly about giving credit where it is due, you "
 "might feel that some secondary contributors also deserve credit in the "
@@ -1787,7 +1807,7 @@
 "싶다면 그렇게 하세요. Perl이 꼭 언급될 필요가 있고 
GNU/Linux/Perl이라고 쓰고 "
 "싶다면 그렇게 하세요."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Since a long name such as GNU/X11/Apache/Linux/TeX/Perl/Python/FreeCiv "
 "becomes absurd, at some point you will have to set a threshold and omit the "
@@ -1799,7 +1819,7 @@
 "때문에 어느 지점에 이르면 한계를 정하고 부차적인 
기여의 이름을 뺄 것입니다. "
 "한계를 정할 적절한 곳이 없으므로 어떻게 정하든 우리는 
반박하지 않을 것입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Different threshold levels would lead to different choices of name for the "
 "system.  But one name that cannot result from concerns of fairness and "
@@ -1811,7 +1831,7 @@
 "린 이름의 한 예가 바로 &ldquo;Linux&rdquo;입니다. 주요 
기여(GNU)를 빼고 부차"
 "적인 기여(Linux)만 인정하는 것은 공평하지 않습니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Many companies contributed to-]{+systemd plays an important role in+}
 # | the {+GNU/Linux+} system as it is today; [-doesn't that mean-] {+are+} we
 # | [-ought-] {+obligated+} to call it [-GNU/Red&nbsp;Hat/Novell/Linux?-]
@@ -1833,7 +1853,7 @@
 "Hat/Novell/Linux로 불러야 하는건 아닌가요?<span 
class=\"anchor-reference-id"
 "\">(<a href=\"#manycompanies\">#manycompanies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "systemd is a fairly important component, but not as important as the kernel "
 "(Linux), nor as important as the basis of the system as a whole (GNU).  "
@@ -1841,7 +1861,7 @@
 "system &ldquo;GNU/systemd/Linux&rdquo;, there is nothing wrong with doing so."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today, but they don't "
 "insist on calling it XYZ/Linux.  Why should we treat GNU specially? <span "
@@ -1851,7 +1871,7 @@
 "Linux라고 부르자고 주장하지 않습니다. 왜 GNU만 특별하게 
취급해야 하나요?"
 "<span class=\"anchor-reference-id\">(<a href=\"#others\">#others</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Thousands of projects have developed programs commonly included in today's "
 "GNU/Linux systems.  They all deserve credit for their contributions, but "
@@ -1862,7 +1882,7 @@
 "니다. 그들은 기여에 대해 공로를 인정받을 만합니다. 
그러나 그들은 전체 시스템"
 "의 주요 개발자가 아니므로 그와 같은 인정을 요청하지 
않습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is different because it is more than just a contributed program, more "
 "than just a collection of contributed programs.  GNU is the framework on "
@@ -1871,7 +1891,7 @@
 "GNU는 다릅니다. 기여된 프로그램 이상이자, 기여된 
프로그램 모음 이상이기 때문"
 "입니다. GNU는 시스템이 만들어진 뼈대입니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "GNU is a small fraction of the system nowadays, so why should we mention it? "
 "<span class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</"
@@ -1881,7 +1901,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In 2008, we found that GNU packages made up 15% of the &ldquo;main&rdquo; "
 "repository of the gNewSense GNU/Linux distribution.  Linux made up 1.5%.  So "
@@ -1893,7 +1913,7 @@
 "되었습니다. 그래서 이와 같은 논의는 &ldquo;Linux&rdquo;라 
부르는 것에 강력하"
 "게 적용될 사안입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is a small fraction of the system nowadays, and Linux is an even smaller "
 "fraction.  But they are the system's core; the system was made by combining "
@@ -1903,7 +1923,7 @@
 "그들은 시스템의 핵심입니다; 시스템은 두 가지의 
결합으로 만들어졌습니다. 그러"
 "므로 &ldquo;GNU/Linux&rdquo; 이름이 적합하게 남은 것입니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many companies contributed to the system as it is today; doesn't that mean "
 "we ought to call it GNU/Red&nbsp;Hat/Novell/Linux? <span class=\"anchor-"
@@ -1913,7 +1933,7 @@
 "Hat/Novell/Linux로 불러야 하는건 아닌가요?<span 
class=\"anchor-reference-id"
 "\">(<a href=\"#manycompanies\">#manycompanies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is not comparable to Red Hat or Novell; it is not a company, or an "
 "organization, or even an activity.  GNU is an operating system.  (When we "
@@ -1926,7 +1946,7 @@
 "제를 개발하는 프로젝트를 가리킵니다). GNU/Linux 운영체ì 
œëŠ” GNU에 바탕을 두고 "
 "있고 GNU가 그 이름에 나타나야 하는 것은 그 때문입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Much of those companies' contribution to the GNU/Linux system lies in the "
 "code they have contributed to various GNU packages including GCC and GNOME.  "
@@ -1937,7 +1957,7 @@
 "키지에 기여한 코드에 집중되어 있습니다. GNU/Linux라고 
말해야 나머지 GNU 개발"
 "자들과 함께 그 회사들의 기여를 인정하는 것이 됩니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
@@ -1946,7 +1966,7 @@
 "왜 &ldquo;GNU Linux&rdquo;대신 &ldquo;GNU/Linux&rdquo;라고 
쓰나요?<span "
 "class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean "
@@ -1958,7 +1978,7 @@
 "&rdquo;이나 &ldquo;Linux는 GNU 패키지&rdquo;를 의미할 수 
있습니다. 둘 중 어"
 "느 것도 현재 상황에 맞지 않습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is not a GNU package; that is, it wasn't developed under the GNU "
 "Project's aegis or contributed specifically to the GNU Project.  Linus "
@@ -1970,14 +1990,32 @@
 "트로 Linux를 독립적으로 만들었습니다. 그래서 &ldquo;Linux는 
GNU 패키지&rdquo;"
 "라는 뜻은 맞지 않습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | We're not talking about a distinct GNU version of Linux, the kernel.  The
+# | free GNU/Linux distros do have a <a
+# | [-href=\"http://directory.fsf.org/project/linux\";>separate-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>separate+} version
+# | of Linux</a>, since the &ldquo;standard&rdquo; version contains
+# | non[---]free firmware &ldquo;blobs&rdquo;.  If this were part of the GNU
+# | Project, it could be considered &ldquo;GNU Linux&rdquo;; but we would not
+# | want to call it that, because it would be too confusing.
+#, fuzzy
+#| msgid ""
+#| "We're not talking about a distinct GNU version of Linux, the kernel.  The "
+#| "free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/";
+#| "project/linux\">separate version of Linux</a>, since the &ldquo;"
+#| "standard&rdquo; version contains non-free firmware &ldquo;blobs&rdquo;.  "
+#| "If this were part of the GNU Project, it could be considered &ldquo;GNU "
+#| "Linux&rdquo;; but we would not want to call it that, because it would be "
+#| "too confusing."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
-"free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/project/";
-"linux\">separate version of Linux</a>, since the &ldquo;standard&rdquo; "
-"version contains non-free firmware &ldquo;blobs&rdquo;.  If this were part "
-"of the GNU Project, it could be considered &ldquo;GNU Linux&rdquo;; but we "
-"would not want to call it that, because it would be too confusing."
+"free GNU/Linux distros do have a <a href=\"https://directory.fsf.org/wiki/";
+"Linux-libre\">separate version of Linux</a>, since the &ldquo;"
+"standard&rdquo; version contains nonfree firmware &ldquo;blobs&rdquo;.  If "
+"this were part of the GNU Project, it could be considered &ldquo;GNU "
+"Linux&rdquo;; but we would not want to call it that, because it would be too "
+"confusing."
 msgstr ""
 "우리는 Linux 커널의 구별된 GNU 판에 대해 이야기하는 것이 
아닙니다. GNU 프로젝"
 "트는 별도의 Linux 판본을 갖고 있지 않습니다. GNU/Linux 
시스템은 다른 Linux 판"
@@ -1985,7 +2023,7 @@
 "Linux 표준판이 이런 시스템들을 위해 개발되었습니다. 
그래서 &ldquo;Linux의 "
 "GNU 판&rdquo; 역시 맞지 않습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We're talking about a version of GNU, the operating system, distinguished by "
 "having Linux as the kernel.  A slash fits the situation because it means "
@@ -1997,7 +2035,7 @@
 "입력/출력&rdquo;을 생각해 보세요) 이 시스템은 GNU와 Linux의 
결합입니다. 그러"
 "므로 &ldquo;GNU/Linux&rdquo;입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are other ways to express &ldquo;combination&rdquo;.  If you think "
 "that a plus-sign is clearer, please use that.  In French, a hyphen is clear: "
@@ -2009,7 +2047,7 @@
 "Linux&rdquo;라고 하는 것이 명확합니다. 스페인어에서는 
&ldquo;GNU con "
 "Linux&rdquo;라고 말하기도 합니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Should we say &ldquo;GNU/BSD&rdquo; too?-]{+How is the name
 # | &ldquo;GNU/Linux&rdquo; pronounced?+} <span
 # | class=\"anchor-reference-id\">(<a [-href=\"#bsd\">#bsd</a>)</span>-]
@@ -2025,14 +2063,14 @@
 "&ldquo;GNU/BSD&rdquo;라고도 불러야 하나요?<span 
class=\"anchor-reference-id"
 "\">(<a href=\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please pronounce it as &ldquo;GNU slash Linux.&rdquo; If you don't pronounce "
 "the slash, people will think you are saying &ldquo;GNU Linux,&rdquo; which "
 "is <a href=\"#whyslash\">not a suitable name for the combination</a>."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | Why do you write [-&ldquo;GNU/Linux&rdquo; instead of-] &ldquo;GNU
 # | [-Linux&rdquo;?-] {+Emacs&rdquo; rather than &ldquo;GNU/Emacs&rdquo;?+}
 # | <span class=\"anchor-reference-id\">(<a
@@ -2051,7 +2089,7 @@
 "왜 &ldquo;GNU Linux&rdquo;대신 &ldquo;GNU/Linux&rdquo;라고 
쓰나요?<span "
 "class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 # | Following the rules of English, in the construction &ldquo;GNU
 # | [-Linux&rdquo;-] {+Emacs&rdquo;+} the word &ldquo;GNU&rdquo; modifies
 # | [-&ldquo;Linux&rdquo;.  This can mean either &ldquo;GNU's version of
@@ -2075,14 +2113,14 @@
 "&rdquo;이나 &ldquo;Linux는 GNU 패키지&rdquo;를 의미할 수 
있습니다. 둘 중 어"
 "느 것도 현재 상황에 맞지 않습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;GNU/Emacs&rdquo; would mean the combination of GNU, the operating "
 "system, and the program Emacs.  That doesn't fit this program, so &ldquo;GNU/"
 "Emacs&rdquo; is the wrong way to refer to it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why &ldquo;GNU/Linux&rdquo; rather than &ldquo;Linux/GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
@@ -2090,7 +2128,7 @@
 "왜 &ldquo;Linux/GNU&rdquo;가 아니라 
&ldquo;GNU/Linux&rdquo;인가요?<span "
 "class=\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is right and proper to mention the principal contribution first.  The GNU "
 "contribution to the system is not only bigger than Linux and prior to Linux, "
@@ -2099,13 +2137,13 @@
 "주요 기여를 먼저 언급하는 것이 맞고 적절합니다. 시스í…
œì— 대한 GNU 기여가 "
 "Linux보다 크고 앞서고 우리가 실제로 전체 활동을 
시작했습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the lowest "
 "level of the system and GNU fills technically higher levels."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
 "lot better than what people usually do, which is to omit GNU entirely and "
@@ -2114,7 +2152,7 @@
 "그런데 &ldquo;Linux/GNU&rdquo;라고 부르고 싶다면, 사람들이 
일반적으로 GNU를 "
 "떼어 버리고 전체 시스템을 Linux만으로 부르는 것보다는 
훨씬 낫습니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
 "say anything about what the system consists of.  Why shouldn't they call it "
@@ -2126,7 +2164,7 @@
 "러서는 안되나요?<span class=\"anchor-reference-id\">(<a href="
 "\"#distronames0\">#distronames0</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling a system &ldquo;Foobar Linux&rdquo; implies that it's a flavor of "
 "&ldquo;Linux,&rdquo; and people <a href=\"#distronames\">understand it that "
@@ -2136,7 +2174,7 @@
 "슷하다는 것을 암시합니다. 사람들은 <a 
href=\"#distronames\">그렇게 이해하곤 "
 "하죠</a>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If they called a GNU/Linux distro &ldquo;Foobar BSD,&rdquo; you would call "
 "that a mistake.  &ldquo;This system is not BSD,&rdquo; you would tell them.  "
@@ -2147,7 +2185,7 @@
 "말하겠죠.그렇다면, Linux도 똑같이 아닙니다. (똑같이 
아니라 생각할 수 있습니"
 "다.)"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro is called &ldquo;Foobar Linux&rdquo;; doesn't that show it's "
 "really Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
@@ -2157,7 +2195,7 @@
 "Linux 같지 않나요?<span class=\"anchor-reference-id\">(<a 
href=\"#distronames"
 "\">#distronames</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It means that the people who make the &ldquo;Foobar Linux&rdquo; distro are "
 "repeating the common mistake. We appreciate that distributions like Debian, "
@@ -2171,7 +2209,7 @@
 "을 느낍니다. 그리고 우리는 만약 당신이 다른 배포판에 
가담하고 있다면, 당신이 "
 "당신의 배포판을 앞 예와 같은 맥락에서 GNU/Linux를 여기길 
바라고 있습니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | My distro's official name is &ldquo;Foobar Linux&rdquo;; isn't it wrong to
 # | call the distro anything but [-&ldquo;Linux&rdquo;?-] {+&ldquo;Foobar
 # | Linux&rdquo;?+} <span class=\"anchor-reference-id\">(<a
@@ -2190,7 +2228,7 @@
 "Linux&rdquo; 이외의 명칭으로 부르는 것은 잘못된 
것인가요?<span class="
 "\"anchor-reference-id\">(<a href=\"#distronames1\">#distronames1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When they spread misinformation by changing &ldquo;GNU&rdquo; to &ldquo;"
 "Linux&rdquo;, and call their version of it &ldquo;Foobar Linux&rdquo;, it's "
@@ -2198,7 +2236,7 @@
 "Linux&rdquo;."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be more effective to ask companies such as Mandrake, Red Hat and "
 "IBM to call their distributions &ldquo;GNU/Linux&rdquo; rather than asking "
@@ -2210,7 +2248,7 @@
 "지 않을까요?<span class=\"anchor-reference-id\">(<a href=\"#companies"
 "\">#companies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It isn't a choice of one or the other&mdash;we ask companies and "
 "organizations and individuals to help spread the word about this.  In fact, "
@@ -2227,7 +2265,7 @@
 "Linux&rdquo;라고 부르면 돈을 좀더 많이 벌 것으로 
예상합니다.&rdquo;라고 말했"
 "습니다. 다시 말하면 그 회사는 뭐가 옳은지 신경쓰지 
않았습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We can't make them do this right, but we're not the sort to give up just "
 "because the road isn't easy.  You may not have as much influence at your "
@@ -2240,7 +2278,7 @@
 "히 도울 수 있습니다. 회사들이 &ldquo;GNU/Linux&rdquo;라 
불러야 수익을 더 많"
 "이 얻을 수 있는 데까지 상황을 함께 바꿔 나갈 수 
있습니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to reserve the name &ldquo;GNU/Linux&rdquo; for "
 "distributions that are purely free software? After all, that is the ideal of "
@@ -2251,15 +2289,35 @@
 "겨 두는 것이 좋지 않을까요? 결국 GNU의 이상이 
그거잖아요.<span class="
 "\"anchor-reference-id\">(<a href=\"#reserve\">#reserve</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+# | The widespread practice of adding non[---]free software to the GNU/Linux
+# | system is a major problem for our community.  It teaches the users that
+# | non[---]free software is ok, and that using it is part of the spirit of
+# | &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of
+# | their mission to help users use non[---]free add-ons, and may even invite
+# | salesmen to come and make sales pitches for them.  They adopt goals such
+# | as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them
+# | use non[---]free applications and drivers), or making the system more
+# | popular even at the cost of freedom.
+#, fuzzy
+#| msgid ""
+#| "The widespread practice of adding non-free software to the GNU/Linux "
+#| "system is a major problem for our community.  It teaches the users that "
+#| "non-free software is ok, and that using it is part of the spirit of "
+#| "&ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part "
+#| "of their mission to help users use non-free add-ons, and may even invite "
+#| "salesmen to come and make sales pitches for them.  They adopt goals such "
+#| "as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them "
+#| "use non-free applications and drivers), or making the system more popular "
+#| "even at the cost of freedom."
 msgid ""
-"The widespread practice of adding non-free software to the GNU/Linux system "
-"is a major problem for our community.  It teaches the users that non-free "
+"The widespread practice of adding nonfree software to the GNU/Linux system "
+"is a major problem for our community.  It teaches the users that nonfree "
 "software is ok, and that using it is part of the spirit of &ldquo;"
 "Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of their "
-"mission to help users use non-free add-ons, and may even invite salesmen to "
+"mission to help users use nonfree add-ons, and may even invite salesmen to "
 "come and make sales pitches for them.  They adopt goals such as &ldquo;"
-"helping the users&rdquo; of GNU/Linux (including helping them use non-free "
+"helping the users&rdquo; of GNU/Linux (including helping them use nonfree "
 "applications and drivers), or making the system more popular even at the "
 "cost of freedom."
 msgstr ""
@@ -2273,11 +2331,11 @@
 "시스템을 더 대중적으로 만드는 것과 같은 목표를 
받아들입니다. 문제는 이것을 어"
 "떻게 바꾸느냐 하는 것입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The question is how to try to change this."
 msgstr "문제는 이를 어떻게 바꾸냐 하는 것입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Given that most of the community which uses GNU with Linux already does not "
 "realize that's what it is, for us to disown these adulterated versions, "
@@ -2290,13 +2348,29 @@
 "상 가르치려 하지 않습니다. 그들은 의도된 메시지를 
들으려 하지 않습니다. 그들"
 "은 이 시스템들이 처음에는 GNU였던 것을 전혀 생각하려 
하지 않습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The way to lead these users to see a connection with freedom is exactly
+# | the opposite: to inform them that all these system versions <em>are</em>
+# | versions of GNU, that they all are based on a system that exists
+# | specifically for the sake of the users' freedom.  With this understanding,
+# | they can start to recognize the distributions that include non[---]free
+# | software as perverted, adulterated versions of GNU, instead of thinking
+# | they are proper and appropriate &ldquo;versions of Linux&rdquo;.
+#, fuzzy
+#| msgid ""
+#| "The way to lead these users to see a connection with freedom is exactly "
+#| "the opposite: to inform them that all these system versions <em>are</em> "
+#| "versions of GNU, that they all are based on a system that exists "
+#| "specifically for the sake of the users' freedom.  With this "
+#| "understanding, they can start to recognize the distributions that include "
+#| "non-free software as perverted, adulterated versions of GNU, instead of "
+#| "thinking they are proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgid ""
 "The way to lead these users to see a connection with freedom is exactly the "
 "opposite: to inform them that all these system versions <em>are</em> "
 "versions of GNU, that they all are based on a system that exists "
 "specifically for the sake of the users' freedom.  With this understanding, "
-"they can start to recognize the distributions that include non-free software "
+"they can start to recognize the distributions that include nonfree software "
 "as perverted, adulterated versions of GNU, instead of thinking they are "
 "proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgstr ""
@@ -2306,7 +2380,7 @@
 "웨어를 포함한 배포판을 적당한 &ldquo;Linux 판본&rdquo;이 
아니라 GNU를 이상하"
 "고 변질시킨 판본이라는 것을 인식할 수 있습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is very useful to start GNU/Linux User Groups, which call the system GNU/"
 "Linux and adopt the ideals of the GNU Project as a basis for their "
@@ -2323,7 +2397,7 @@
 "사람들은 자신들의 관점을 갖을 권리가 있지만, 그들이 
여러분을 이끌도록 하지 마"
 "세요."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not make a GNU distribution of Linux (sic) and call that GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
@@ -2333,7 +2407,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "All the &ldquo;Linux&rdquo; distributions are actually versions of the GNU "
 "system with Linux as the kernel.  The purpose of the term &ldquo;GNU/"
@@ -2346,7 +2420,7 @@
 "해 그것만 &ldquo;GNU/Linux&rdquo;라 부르는 것은 우리의 주장을 
불분명하게 할 "
 "것입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "As for developing a distribution of GNU/Linux, we already did this once, "
 "when we funded the early development of Debian GNU/Linux.  To do it again "
@@ -2359,7 +2433,7 @@
 "이 많습니다. 그리고 새 배포판이 기존의 다른 배포판에 
비해 실질적이고 실용적"
 "이 이점이 더 많지 않는 한 목적을 충족시킬 것 같지 
않습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Instead we help the developers of 100% free GNU/Linux distributions, such as "
 "gNewSense and Ututo."
@@ -2367,7 +2441,7 @@
 "대신에 우리는 100% 무료 GNU/Linux 배포판의 개발자들을 도울 
것입니다. 예를들"
 "어, gNewSense 그리고 Ututo가 있죠."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not just say &ldquo;Linux is the GNU kernel&rdquo; and release some "
 "existing version of GNU/Linux under the name &ldquo;GNU&rdquo;? <span class="
@@ -2377,7 +2451,7 @@
 "름을 가진 기존 GNU/Linux 판본을 출시하지 않나요?<span 
class=\"anchor-"
 "reference-id\">(<a href=\"#linuxgnu\">#linuxgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It might have been a good idea to adopt Linux as the GNU kernel back in "
 "1992.  If we had realized, then, how long it would take to get the GNU Hurd "
@@ -2389,7 +2463,7 @@
 "가 없습니다. 우리는 GNU/Linux를 &ldquo;GNU&rdquo;로 발표하고 
싶지 않습니다. "
 "진짜 GNU 시스템을 발표할 준비가 됐기 때문입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we were to take an existing version of GNU/Linux and relabel it as &ldquo;"
 "GNU&rdquo;, that would be somewhat like making a version of the GNU system "
@@ -2401,7 +2475,7 @@
 "Linux&rdquo;라고 이름 붙이는 것과 닮았습니다. 그것은 옳지 
않습니다. 그리고 그"
 "렇게 하고 싶지도 않습니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Did the GNU Project condemn and oppose use of Linux in the early days? <span "
 "class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
@@ -2409,7 +2483,7 @@
 "GNU 프로젝트는 초기에 Linux 사용을비난하고 
반대했었나요?<span class=\"anchor-"
 "reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We did not adopt Linux as our kernel, but we didn't condemn or oppose it.  "
 "In 1993 we started discussing the arrangements to sponsor the development of "
@@ -2427,7 +2501,7 @@
 "통일 때가 종종 있었고 이식성이 좋지 못했습니다. 
그것들은 설치를 위해 정리될 "
 "필요가 있었습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who had made the changes showed little interest in cooperating "
 "with us.  One of them actually told us that he didn't care about working "
@@ -2445,7 +2519,7 @@
 "다. GNU에 주된 바탕을 둔 시스템을 개발한 이 사람들은 
우리와 함께 일하려 하지 "
 "않은 첫 번째(그리고 여전히 실제로 유일한) 
그룹이었습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It was this experience that first showed us that people were calling a "
 "version of the GNU system &ldquo;Linux&rdquo;, and that this confusion was "
@@ -2458,7 +2532,7 @@
 "라고 부탁하는 것은 그 문제와 &ldquo;Linux&rdquo;라는 틀린 
이름 때문에 생긴 다"
 "른 문제에 대한 우리의 반응입니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why did you wait so long before asking people to use the name GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
@@ -2466,7 +2540,7 @@
 "GNU/Linux라는 이름을 사람들에게 써달라고 요청하기 전에 
왜 그리 오래 기다렸었"
 "나요?<span class=\"anchor-reference-id\">(<a 
href=\"#wait\">#wait</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually we didn't.  We began talking privately with developers and "
 "distributors about this in 1994, and made a more public campaign in 1996.  "
@@ -2476,7 +2550,7 @@
 "으로 이에 대해 이야기했습니다. 그리고 1996년에 좀더 
공개적인 운동을 시작했습"
 "니다. 필요하다면 이 운동을 앞으로도 계속 할 것입니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should the GNU/<i>name</i> convention be applied to all programs that are "
 "GPL'ed? <span class=\"anchor-reference-id\">(<a href=\"#allgpled"
@@ -2485,7 +2559,7 @@
 "GNU/[name]은 GPL 프로그램에 전부 적용해야하나요?<span 
class=\"anchor-"
 "reference-id\">(<a href=\"#allgpled\">#allgpled</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We never refer to individual programs as &ldquo;GNU/<i>name</i>&rdquo;.  "
 "When a program is a GNU package, we may call it &ldquo;GNU <i>name</"
@@ -2494,7 +2568,7 @@
 "우리는 개별 프로그램을 &ldquo;GNU/<i>이름</i>&rdquo;으로 절대 
부르지 않습니"
 "다. 프로그램이 패키지라면 우리는 
&ldquo;GNU<i>이름</i>&rdquo;이라 부릅니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU, the operating system, is made up of many different programs.  Some of "
 "the programs in GNU were written as part of the GNU Project or specifically "
@@ -2505,7 +2579,7 @@
 "프로젝트의 일부분으로 만들어졌거나 GNU 프로젝트에 
특별히 기증됐습니다. 이것들"
 "이 GNU 패키지이고 그 이름에 &ldquo;GNU&rdquo;를 종종 
사용합니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It's up to the developers of a program to decide if they want to contribute "
 "it and make it a GNU package.  If you have developed a program and you would "
@@ -2518,7 +2592,7 @@
 "<a href=\"mailto:gnu@gnu.org\";>&lt;gnu@gnu.org&gt;</a>로 전자 우편을 
보내세"
 "요. FSF에서 그것을 평가하고 우리에게 필요한지 결정할 
것입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It wouldn't be fair to put the name GNU on every individual program that is "
 "released under the GPL.  If you write a program and release it under the "
@@ -2537,7 +2611,7 @@
 "GNU 패키지가 아니라면 GNU 프로젝트는 그 공을 차지할 수 
없고 그 이름에 &ldquo;"
 "GNU&rdquo;라는 이름을 넣는 것은 부적절합니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In contrast, we do deserve the overall credit for the GNU operating system "
 "as a whole, even though not for each and every program in it.  The system "
@@ -2549,7 +2623,7 @@
 "시작되기 몇년 전인 1984년부터 시작한 우리의 결단과 
끈기로 말미암아 시스템은 "
 "시스템으로 존재합니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The operating system in which Linux became popular was basically the same as "
 "the GNU operating system.  It was not entirely the same, because it had a "
@@ -2560,7 +2634,7 @@
 "문이었습니다. 커널이 다르기 때문에 완전히 같지는 
않았지만 대부분 같은 시스템"
 "이었습니다. 그것은 GNU의 변종, GNU/Linux 시스템입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux continues to be used primarily in derivatives of that system&mdash;in "
 "today's versions of the GNU/Linux system.  What gives these systems their "
@@ -2571,7 +2645,7 @@
 "입니다. 이 시스템들에 정체성을 주는 것은 Linux만이 
아니라 그 중심에 있는 GNU"
 "와 Linux입니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since much of GNU comes from Unix, shouldn't GNU give credit to Unix by "
 "using &ldquo;Unix&rdquo; in its name? <span class=\"anchor-reference-id\">"
@@ -2581,7 +2655,7 @@
 "써서 Unix의 기여를 인정해야하지 않나요?<span 
class=\"anchor-reference-id\">"
 "(<a href=\"#unix\">#unix</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Actually, none of GNU comes from Unix.  Unix was proprietary software (and "
 "still is), so using any of its code in GNU would have been illegal.  This is "
@@ -2597,7 +2671,7 @@
 "템이 필요했습니다. 우리는 프로그램이나 그 일부를 유
닉스에서 베낄 수 없었습니"
 "다. 모든 것을 전부 새롭게 만들어야 했습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "No code in GNU comes from Unix, but GNU is a Unix-compatible system; "
 "therefore, many of the ideas and specifications of GNU do come from Unix.  "
@@ -2610,13 +2684,29 @@
 "다. &ldquo;GNU&rdquo;라는 이름은 1970년대에 시작된 재귀 
약어라는 해커 전통에 "
 "따라, 유닉스에 경의를 표하는 익살스러운 방법입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.
+# |  The author of TINT wrote another implementation of TECO (there were
+# | already many of them, for various systems), but instead of calling it by a
+# | dull name like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of
+# | a clever amusing name.  (That's what hacking means: <a
+# | href=\"http{+s+}://stallman.org/articles/on-hacking.html\">playful
+# | cleverness</a>.)
+#, fuzzy
+#| msgid ""
+#| "The first such recursive acronym was TINT, &ldquo;TINT Is Not "
+#| "TECO&rdquo;.  The author of TINT wrote another implementation of TECO "
+#| "(there were already many of them, for various systems), but instead of "
+#| "calling it by a dull name like &ldquo;<em>somethingorother</em> "
+#| "TECO&rdquo;, he thought of a clever amusing name.  (That's what hacking "
+#| "means: <a href=\"http://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
 "The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
 "The author of TINT wrote another implementation of TECO (there were already "
 "many of them, for various systems), but instead of calling it by a dull name "
 "like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of a clever "
-"amusing name.  (That's what hacking means: <a href=\"http://stallman.org/";
+"amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
 "이러한 재귀어의 처음은 TINT,&ldquo;TINT Is Not 
TECO&rdquo;였습니다. TINT라는 "
@@ -2625,7 +2715,7 @@
 "있고 재미있는 이름을 지었습니다. (이것이 바로 해킹이 
의미하는 바, <a href="
 "\"http://stallman.org/articles/on-hacking.html\";>재치있는 기발함</a>입
니다.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Other hackers enjoyed that name so much that we imitated the approach.  It "
 "became a tradition that, when you were writing from scratch a program that "
@@ -2641,7 +2731,7 @@
 "은 정신으로 우리는 우리의 유닉스 대체품을 &ldquo;GNU's Not 
Unix&rdquo;라고 불"
 "렀습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Historically, AT&amp;T which developed Unix did not want anyone to give it "
 "credit by using &ldquo;Unix&rdquo; in the name of a similar system, not even "
@@ -2657,7 +2747,7 @@
 "을 걸 것입니다. 이 때문에 다양한 컴퓨터 회사에서 만든 
다양한 유닉스 수정판들"
 "이(모두 유닉스처럼 독점적이었습니다) 전부 이름이 서로 
달랐습니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we say &ldquo;GNU/BSD&rdquo; too? <span class=\"anchor-reference-id\">"
 "(<a href=\"#bsd\">#bsd</a>)</span>"
@@ -2665,7 +2755,7 @@
 "&ldquo;GNU/BSD&rdquo;라고도 불러야 하나요?<span 
class=\"anchor-reference-id"
 "\">(<a href=\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems, "
 "because that term does not fit the history of the BSD systems."
@@ -2673,9 +2763,19 @@
 "BSD 시스템(FreeBSD 등)은 &ldquo;GNU/BSD&rdquo; 시스템이라고 
부르지 않습니다. "
 "BSD 시스템의 역사에 맞지 않기 때문입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The BSD system was developed by UC Berkeley as non[---]free software in
+# | the 80s, and became free in the early 90s.  A free operating system that
+# | exists today is almost certainly either a variant of the GNU system, or a
+# | kind of BSD system.
+#, fuzzy
+#| msgid ""
+#| "The BSD system was developed by UC Berkeley as non-free software in the "
+#| "80s, and became free in the early 90s.  A free operating system that "
+#| "exists today is almost certainly either a variant of the GNU system, or a "
+#| "kind of BSD system."
 msgid ""
-"The BSD system was developed by UC Berkeley as non-free software in the 80s, "
+"The BSD system was developed by UC Berkeley as nonfree software in the 80s, "
 "and became free in the early 90s.  A free operating system that exists today "
 "is almost certainly either a variant of the GNU system, or a kind of BSD "
 "system."
@@ -2684,7 +2784,7 @@
 "초반에 자유롭게 됐습니다. 오늘날 존재하는 자유 운영체ì 
œëŠ” 거의 대부분 GNU 시"
 "스템의 변형이거나 BSD 시스템의 일종입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "People sometimes ask whether BSD too is a variant of GNU, as GNU/Linux is.  "
 "It is not.  The BSD developers were inspired to make their code free "
@@ -2697,7 +2797,7 @@
 "로 마음 먹었고 GNU 활동가들이 BSD 개발자들이 그 일을 
시작할 확신이 들도록 분"
 "명히 호소하기는 했지만 BSD 코드는 GNU와 거의 겹치지 
않습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "BSD systems today use some GNU packages, just as the GNU system and its "
 "variants use some BSD programs; however, taken as wholes, they are two "
@@ -2710,7 +2810,7 @@
 "로 발전해왔습니다. BSD 개발자들은 커널을 개발하지 
않았고 커널을 GNU 시스템에 "
 "추가했습니다. 따라서 GNU/BSD 같은 이름은 상황에 맞지 
않습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The connection between GNU/Linux and GNU is much closer, and that's why the "
 "name &ldquo;GNU/Linux&rdquo; is appropriate for it."
@@ -2718,7 +2818,7 @@
 "GNU/Linux와 GNU의 관계가 더 가깝습니다. 그래서 
&ldquo;GNU/Linux&rdquo;라는 이"
 "름이 더 적절한 것입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is a version of GNU which uses the kernel from NetBSD.  Its developers "
 "call it &ldquo;Debian GNU/NetBSD&rdquo;, but &ldquo;GNU/"
@@ -2731,7 +2831,7 @@
 "정확합니다. NetBSD는 전체 시스템이지 커널이 아니기 
때문입니다. 이것은 BSD 시"
 "스템이 아닙니다. 시스템 대부분이 GNU/Linux 시스템과 같이 
때문입니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "If I install the GNU tools on Windows, does that mean I am running a GNU/"
 "Windows system? <span class=\"anchor-reference-id\">(<a href=\"#othersys"
@@ -2741,7 +2841,7 @@
 "의미인가요?<span class=\"anchor-reference-id\">(<a href=\"#othersys"
 "\">#othersys</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
 "GNU are just a part of the GNU software, which is just a part of the GNU "
@@ -2754,7 +2854,7 @@
 "제를 갖고 있습니다. 스스로 독립적인데, 이 점이 바로 
GNU/Linux와 다른 상황입니"
 "다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can't Linux be used without GNU? <span class=\"anchor-reference-id\">(<a "
 "href=\"#justlinux\">#justlinux</a>)</span>"
@@ -2762,7 +2862,7 @@
 "GNU가 없는 Linux는 있을 수 없나요?<span 
class=\"anchor-reference-id\">(<a "
 "href=\"#justlinux\">#justlinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is used by itself, or with small other programs, in some appliances.  "
 "These small software systems are a far cry from the GNU/Linux system.  Users "
@@ -2776,7 +2876,7 @@
 "한 기계들은 단지 GNU/Linux와 어떻게 다른지를 보여주는 
위해 Linux를 가동한다라"
 "고 말하는 것은 유용할 수 있습니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How much of the GNU system is needed for the system to be GNU/Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
@@ -2784,7 +2884,7 @@
 "시스템이 GNU/Linux 되기 위해서 얼마나 많은 GNU 시스템이 
필요한가요?<span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "&ldquo;How much&rdquo; is not a meaningful question because the GNU system "
 "does not have precise boundaries."
@@ -2792,7 +2892,7 @@
 "&ldquo;얼마나&rdquo;라는 것은 GNU가 정확한 경계선이 
없기때문에 의미없는 질문"
 "입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is an operating system maintained by a community.  It includes far more "
 "than just the GNU software packages (of which we have a specific list), and "
@@ -2808,7 +2908,7 @@
 "신이 GNU의 한 부분을 사용하고 있고 그 부분을 
생략한다면, &ldquo;얼마나&rdquo;"
 "사용하냐 라는 말은 의미 자체가 없습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we look at the level of packages, Linux is one important package in the "
 "GNU/Linux system.  The inclusion of one important GNU package is enough to "
@@ -2818,7 +2918,7 @@
 "다. 중요한 GNU 패키지의 포함은 우리가 요구한 부분을 
동등한 언급으로 정당화하"
 "기에 충분합니다. "
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Are there complete Linux systems [sic] without GNU? <span class=\"anchor-"
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
@@ -2827,7 +2927,7 @@
 "GNU가 없는 완전한 Linux 시스템들이 있나요?<span 
class=\"anchor-reference-id"
 "\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There are complete systems that contain Linux and not GNU; Android is an "
 "example.  But it is a mistake to call them &ldquo;Linux&rdquo; systems, just "
@@ -2837,7 +2937,7 @@
 "대표적인 예이죠. 그러나 그것을 &ldquo;Linux&rdquo;라 부르는 
것은 실수입니다. "
 "마치 GNU를 &ldquo;Linux&rdquo;만으로 부르는 것과 똑같은 
것처럼 말이죠."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android is very different from the GNU/Linux system&mdash;because the two "
 "have very little code in common.  In fact, the only thing they have in "
@@ -2846,7 +2946,7 @@
 "Android는 GNU/Linux와 매우 다른 것입니다. 두 개체는 공통된 
코드를 거의 가지"
 "지 않습니다. 사실 이 둘이 가지는 공통 사항은 Linux를 
사용한다는 것입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
 "necessary to say things like, &ldquo;Android contains Linux, but it isn't "
@@ -2858,7 +2958,7 @@
 "[sic] Library들과 유틸리티들[GNU 시스템을 뜻함]을 가지고 
있지 않기 때문이다."
 "&rdquo;라고 말해야할 필요를 느낄 것입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android contains just as much of Linux as GNU/Linux does.  What it doesn't "
 "have is the GNU system.  Android replaces that with Google software that "
@@ -2870,7 +2970,7 @@
 "Google 소프트웨어로 대체하였습니다. Android가 
GNU/Linux로부터 가지는 차이점"
 "은 GNU가 존재하지 않는 것입니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Are there complete Linux systems [sic] without GNU?-]{+Is it correct to
 # | say &ldquo;using Linux&rdquo; if it refers to using GNU/Linux and using
 # | Android?+} <span class=\"anchor-reference-id\">(<a
@@ -2891,27 +2991,27 @@
 "GNU가 없는 완전한 Linux 시스템들이 있나요?<span 
class=\"anchor-reference-id"
 "\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Far from it.  That usage is so strained that people will not understand the "
 "intended meaning."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public will find it very strange to speak of using Android as &ldquo;"
 "using Linux&rdquo;.  It's like having a conversation, then saying you were "
 "conversing with the person's intestines or the person's circulatory system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public <em>will</em> understand the idea of &ldquo;using Linux&rdquo; "
 "when it's really GNU/Linux, by way of the usual misunderstanding: thinking "
 "of the whole system as &ldquo;Linux&rdquo;."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Use of Android and use of GNU/Linux are totally different, as different as "
 "driving a car and riding a bicycle.  The fact that the first two both "
@@ -2924,7 +3024,7 @@
 "GNU/Linux and Android.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not call the system &ldquo;Linux&rdquo; anyway, and strengthen Linus "
 "Torvalds' role as posterboy for our community? <span class=\"anchor-"
@@ -2934,7 +3034,7 @@
 "Torvalds의 역할을 간판으로 강화하는 건 어떻나요?<span 
class=\"anchor-"
 "reference-id\">(<a href=\"#helplinus\">#helplinus</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Linus Torvalds is the &ldquo;posterboy&rdquo; (other people's choice of "
 "word, not ours) for his goals, not ours.  His goal is to make the system "
@@ -2952,12 +3052,30 @@
 "\"/philosophy/why-free.html\">서로 돕는 자유</a>를 옹호하지 
않았습니다. 이 때"
 "문에 대중은 &ldquo;Linux&rdquo;라는 이름과 그 원칙을 
연결시키지 못합니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | Linus publicly states his disagreement with the free software movement's
+# | ideals.  He developed non[---]free software in his job for many years (and
+# | said so to a large audience at a &ldquo;Linux&rdquo;World show), and
+# | publicly invited fellow developers of Linux, the kernel, to use
+# | non[---]free software to work on it with him.  He goes even further, and
+# | rebukes people who suggest that engineers and scientists should consider
+# | social consequences of our technical work&mdash;rejecting the lessons
+# | society learned from the development of the atom bomb.
+#, fuzzy
+#| msgid ""
+#| "Linus publicly states his disagreement with the free software movement's "
+#| "ideals.  He developed non-free software in his job for many years (and "
+#| "said so to a large audience at a &ldquo;Linux&rdquo;World show), and "
+#| "publicly invited fellow developers of Linux, the kernel, to use non-free "
+#| "software to work on it with him.  He goes even further, and rebukes "
+#| "people who suggest that engineers and scientists should consider social "
+#| "consequences of our technical work&mdash;rejecting the lessons society "
+#| "learned from the development of the atom bomb."
 msgid ""
 "Linus publicly states his disagreement with the free software movement's "
-"ideals.  He developed non-free software in his job for many years (and said "
+"ideals.  He developed nonfree software in his job for many years (and said "
 "so to a large audience at a &ldquo;Linux&rdquo;World show), and publicly "
-"invited fellow developers of Linux, the kernel, to use non-free software to "
+"invited fellow developers of Linux, the kernel, to use nonfree software to "
 "work on it with him.  He goes even further, and rebukes people who suggest "
 "that engineers and scientists should consider social consequences of our "
 "technical work&mdash;rejecting the lessons society learned from the "
@@ -2971,7 +3089,7 @@
 "를 고려해야 한다고 제안하는 사람들을 비난하고 원자 
폭탄 개발에서 사회가 배운 "
 "교훈을 거부했습니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with writing a free program for the motivations of "
 "learning and having fun; the kernel Linus wrote for those reasons was an "
@@ -2990,7 +3108,7 @@
 "사람들은 문제의 운영체제는 그의 관점이 아니라 자유의 
이상에서 비롯된 것임을 "
 "알아야 합니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong for us to label Linus Torvalds' work as GNU? <span class="
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
@@ -2999,7 +3117,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong, so we don't do that.  Torvalds' work is Linux, the "
 "kernel; we are careful not to attribute that work to the GNU Project or "
@@ -3012,7 +3130,7 @@
 "스템에 대해 얘기할 때 &ldquo;GNU/Linux&rdquo;이름을 그에게 
기여의 공유로 제공"
 "합니다. "
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Does Linus Torvalds agree that Linux is just the kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
@@ -3020,10 +3138,23 @@
 "Linus Torvals는 Linux를 단지 커널이라는 것에 동의하나요?<span 
class=\"anchor-"
 "reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | He recognized this at the beginning.  The earliest Linux release notes
+# | said, <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | &ldquo;Most of the tools used with linux are GNU software and are under
+# | the GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
+# |  for more info&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
+#| "versions/RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are "
+#| "GNU software and are under the GNU copyleft. These tools aren't in the "
+#| "distribution - ask me (or GNU)  for more info&rdquo;</a>."
 msgid ""
 "He recognized this at the beginning.  The earliest Linux release notes said, "
-"<a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"<a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
 "RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are GNU software "
 "and are under the GNU copyleft. These tools aren't in the distribution - ask "
 "me (or GNU)  for more info&rdquo;</a>."
@@ -3034,7 +3165,7 @@
 "저작권 아래 있습니다. 이 도구들은 배포판에 들어있지 
않습니다. 더 자세한 정보"
 "는 저(나 GNU)에 문의하세요.&rdquo;</a>라고 적혀있습니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not finish the GNU Hurd kernel, release the GNU system as a whole, and "
 "forget the question of what to call GNU/Linux? <span class=\"anchor-"
@@ -3044,20 +3175,34 @@
 "한 문제를 해결하는 것은 어떨까요?<span 
class=\"anchor-reference-id\">(<a "
 "href=\"#finishhurd\">#finishhurd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We would like credit for the GNU operating system no matter which kernel is "
 "used with it."
 msgstr ""
 "우리는 어떠한 커널이 사용되었든 GNU 운영체제에 대한 
기여를 할 것입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | Making the GNU Hurd work well enough to compete with Linux would be a big
+# | job, and it's not clearly necessary.  The only thing ethically wrong with
+# | Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the
+# | best fix for that problem is <a
+# | [-href=\"http://fsf.org/campaigns/priority-projects\";>-]
+# | {+href=\"https://www.fsf.org/campaigns/priority-projects\";>+} developing
+# | free replacement for the blobs</a>.
+#, fuzzy
+#| msgid ""
+#| "Making the GNU Hurd work well enough to compete with Linux would be a big "
+#| "job, and it's not clearly necessary.  The only thing ethically wrong with "
+#| "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the "
+#| "best fix for that problem is <a href=\"http://fsf.org/campaigns/priority-";
+#| "projects\"> developing free replacement for the blobs</a>."
 msgid ""
 "Making the GNU Hurd work well enough to compete with Linux would be a big "
 "job, and it's not clearly necessary.  The only thing ethically wrong with "
 "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the best "
-"fix for that problem is <a href=\"http://fsf.org/campaigns/priority-projects";
-"\"> developing free replacement for the blobs</a>."
+"fix for that problem is <a href=\"https://www.fsf.org/campaigns/priority-";
+"projects\"> developing free replacement for the blobs</a>."
 msgstr ""
 "Linux와 충분히 경쟁할 만한 GND Hurd를 만드는 작업은 큰 
일이 될 것이나 이것이 "
 "명확히 필요하지는 않습니다. Linux를 커널로 봤을 때 윤리ì 
ìœ¼ë¡œ 옳지 못한 단 "
@@ -3065,7 +3210,7 @@
 "은 방안은 <a href=\"http://fsf.org/campaigns/priority-projects\";>무료 
대체물"
 "인 blobs을 개발하는 것입니다.</a>"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The battle is already lost&mdash;society has made its decision and we can't "
 "change it, so why even think about it? <span class=\"anchor-reference-id\">"
@@ -3075,7 +3220,7 @@
 "수 없죠. 그런데 왜 그 문제에 대해서 계속 
생각하나요?<span class=\"anchor-"
 "reference-id\">(<a href=\"#lost\">#lost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This isn't a battle, it is a campaign of education.  What to call the system "
 "is not a single decision, to be made at one moment by &ldquo;society&rdquo;: "
@@ -3090,7 +3235,7 @@
 "&rdquo;라고 말하라고 할 수 없습니다. 그러나 스스로 
&ldquo;GNU/Linux&rdquo;라"
 "고 부르기로 결정하고 그렇게 함으로써 우리를 도울 수 
있습니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Society has made its decision and we can't change it, so what good does it "
 "do if I say &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id\">(<a "
@@ -3100,7 +3245,7 @@
 "Linux&rdquo;라고 부르는 것에는 어떤 이점이 있나요?<span 
class=\"anchor-"
 "reference-id\">(<a href=\"#whatgood\">#whatgood</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is not an all-or-nothing situation: correct and incorrect pictures are "
 "being spread more or less by various people.  If you call the system &ldquo;"
@@ -3119,7 +3264,7 @@
 "걸 본다면, 큰 노력을 들이지 않더라도 몇몇 사람은 가르칠
 수 있습니다. 그들 중 "
 "일부는 다른 사람들에게 바로잡은 것을 퍼뜨릴 것입니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to call the system &ldquo;Linux&rdquo; and teach "
 "people its real origin with a ten-minute explanation? <span class=\"anchor-"
@@ -3129,7 +3274,7 @@
 "도 설명하여 가르치는 것도 좋지 않을까요?<span 
class=\"anchor-reference-id\">"
 "(<a href=\"#explain\">#explain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "If you help us by explaining to others in that way, we appreciate your "
 "effort, but that is not the best method.  It is not as effective as calling "
@@ -3139,7 +3284,7 @@
 "다. 그러나 그것은 가장 좋은 방법이 아닙니다. 
&ldquo;GNU/Linux&rdquo;로 부르"
 "는 것만큼 효과적이지 않고 시간을 비효율적으로 쓰는 
것입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is ineffective because it may not sink in, and surely will not "
 "propagate.  Some of the people who hear your explanation will pay attention, "
@@ -3155,7 +3300,7 @@
 "Linux&rdquo;라 부를 것입니다. 특별히 의도하지 않는 한 
그들은 잘못된 그림이 퍼"
 "지는 것을 돕는 셈입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is inefficient because it takes a lot more time.  Saying and writing "
 "&ldquo;GNU/Linux&rdquo; will take you only a few seconds a day, not minutes, "
@@ -3169,7 +3314,7 @@
 "구별하는 것은 GNU 프로젝트를 효과적으로 돕는 지금까지 
알려진 가장 쉬운 방법입"
 "니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people laugh at you when you ask them to call the system GNU/Linux.  "
 "Why do you subject yourself to this treatment? <span class=\"anchor-"
@@ -3179,7 +3324,7 @@
 "우를 받으려 하나요?<span class=\"anchor-reference-id\">(<a 
href=\"#treatment"
 "\">#treatment</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; tends to give people a mistaken "
 "picture of the system's history and reason for existence.  People who laugh "
@@ -3193,7 +3338,7 @@
 "서 우리가 그에 대한 기여를 인정해 달라고 할 때 
웃습니다. 진실을 안다면 그들"
 "은 웃지 않을 것입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Why do we take the risk of making a request that sometimes leads people to "
 "ridicule us? Because often it has useful results that help the GNU Project.  "
@@ -3203,7 +3348,7 @@
 "GNU 프로젝트를 돕는 유익한 결과를 가져올 때가 종종 있기 
때문입니다. 우리는 우"
 "리의 목적을 달성하기 위해서라면 잘못된 오용도 감수할 
것입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you see such an ironically unfair situation occurring, please don't sit "
 "idly by.  Please teach the laughing people the real history.  When they see "
@@ -3213,7 +3358,7 @@
 "요. 웃는 사람들에게 진짜 역사를 가르쳐 주세요. 요청이 
왜 정당한지 그들이 알"
 "면 지각 있는 사람이라면 웃음을 멈출 것입니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people condemn you when you ask them to call the system GNU/Linux.  "
 "Don't you lose by alienating them? <span class=\"anchor-reference-id\">(<a "
@@ -3223,7 +3368,7 @@
 "과 멀어져 지는 것은 아닌지요?<span 
class=\"anchor-reference-id\">(<a href="
 "\"#alienate\">#alienate</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not much.  People who don't appreciate our role in developing the system are "
 "unlikely to make substantial efforts to help us.  If they do work that "
@@ -3239,7 +3384,7 @@
 "게 돌리도록 가르침으로써 그들은 다른 사람을 돕는 
우리의 능력을 해치고 있습니"
 "다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It makes no sense to worry about alienating people who are already mostly "
 "uncooperative, and it is self-defeating to be deterred from correcting a "
@@ -3251,7 +3396,7 @@
 "여 ê·¸ 큰 문제를 정정하는 것을 단념하게하여 자기 패배ì 
ìž…니다. 그러므로, 우리"
 "는 계속해서 오칭을 정정하려 노력할 것입니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Whatever you contributed, is it legitimate to rename the operating system? "
 "<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
@@ -3260,7 +3405,7 @@
 "인가요?<span class=\"anchor-reference-id\">(<a 
href=\"#rename\">#rename</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are not renaming anything; we have been calling this system &ldquo;"
 "GNU&rdquo; ever since we announced it in 1983.  The people who tried to "
@@ -3270,7 +3415,7 @@
 "&ldquo;GNU&rdquo;라고 불러왔습니다. &ldquo;Linux&rdquo;라고 
이름을 바꾸려던 "
 "사람들이 그렇게 했던 것입니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong to force people to call the system &ldquo;GNU/Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
@@ -3279,7 +3424,7 @@
 "않나요?<span class=\"anchor-reference-id\">(<a 
href=\"#force\">#force</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong to force them, and we don't try.  We call the system "
 "&ldquo;GNU/Linux&rdquo;, and we ask you to do it too."
@@ -3287,7 +3432,7 @@
 "그들에게 강요하는 것은 잘못된 일이며 우리는 그러지 
않습니다. 우리는 시스템을 "
 "&ldquo;GNU/Linux&rdquo;라고 부르며 우리는 그것을 요청할 뿐입
니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not sue people who call the whole system &ldquo;Linux&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
@@ -3296,7 +3441,7 @@
 "요?<span class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are no legal grounds to sue them, but since we believe in freedom of "
 "speech, we wouldn't want to do that anyway.  We ask people to call the "
@@ -3306,7 +3451,7 @@
 "렇게 하고 싶지 않습니다. 우리는 사람들에게 
&ldquo;GNU/Linux&rdquo;라고 불러달"
 "라고 부탁합니다. 그렇게 하는 게 옳은 일이기 때문입
니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Shouldn't you put something in the GNU GPL to require people to call the "
 "system &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id\">(<a href="
@@ -3316,13 +3461,31 @@
 "하지 않나요?<span class=\"anchor-reference-id\">(<a href=\"#require"
 "\">#require</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
+# | The purpose of the GNU GPL is to protect the users' freedom from those who
+# | would make proprietary versions of free software.  While it is true that
+# | those who call the system &ldquo;Linux&rdquo; often do things that limit
+# | the users' freedom, such as bundling non[---]free software with the
+# | GNU/Linux system or even developing non[---]free software for such use,
+# | the mere act of calling the system &ldquo;Linux&rdquo; does not, in
+# | itself, deny users their freedom.  It seems improper to make the GPL
+# | restrict what name people can use for the system.
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU GPL is to protect the users' freedom from those "
+#| "who would make proprietary versions of free software.  While it is true "
+#| "that those who call the system &ldquo;Linux&rdquo; often do things that "
+#| "limit the users' freedom, such as bundling non-free software with the GNU/"
+#| "Linux system or even developing non-free software for such use, the mere "
+#| "act of calling the system &ldquo;Linux&rdquo; does not, in itself, deny "
+#| "users their freedom.  It seems improper to make the GPL restrict what "
+#| "name people can use for the system."
 msgid ""
 "The purpose of the GNU GPL is to protect the users' freedom from those who "
 "would make proprietary versions of free software.  While it is true that "
 "those who call the system &ldquo;Linux&rdquo; often do things that limit the "
-"users' freedom, such as bundling non-free software with the GNU/Linux system "
-"or even developing non-free software for such use, the mere act of calling "
+"users' freedom, such as bundling nonfree software with the GNU/Linux system "
+"or even developing nonfree software for such use, the mere act of calling "
 "the system &ldquo;Linux&rdquo; does not, in itself, deny users their "
 "freedom.  It seems improper to make the GPL restrict what name people can "
 "use for the system."
@@ -3335,7 +3498,7 @@
 "다. GPL이 사람들이 사용할 시스템 이름을 제한하도록 
만드는 것은 부적절해 보입"
 "니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you objected to the original BSD license's advertising requirement to "
 "give credit to the University of California, isn't it hypocritical to demand "
@@ -3347,7 +3510,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#BSDlicense\">#BSDlicense</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would be hypocritical to make the name GNU/Linux a license requirement, "
 "and we don't.  We only <em>ask</em> you to give us the credit we deserve."
@@ -3355,7 +3518,7 @@
 "GNU/Linux를 라이선스로 만드는 것은 위선적인 것이며 
우리는 그러지 않습니다. 우"
 "리는 단지 우리가 마땅히 받아야할 기여를 달라는 
<em>요청</em>을 할 뿐입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please note that there are at least <a href=\"/licenses/bsd.html\"> two "
 "different BSD licenses</a>.  For clarity's sake, please don't use the term "
@@ -3365,7 +3528,7 @@
 "함을 위해, &ldquo;BSD 라이센스&rdquo;르 어떤 한 부분을 ì 
œì™¸í•˜ê³  ê·¸ 용어를 사"
 "용하지 마십시오."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you failed to put something in the GNU GPL to require people to call "
 "the system &ldquo;GNU&rdquo;, you deserve what happened; why are you "
@@ -3376,7 +3539,7 @@
 "하여도 당연합니다.왜 이제 와서 불평을 하나요?<span 
class=\"anchor-reference-"
 "id\">(<a href=\"#deserve\">#deserve</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The question presupposes a rather controversial general ethical premise: "
 "that if people do not force you to treat them fairly, you are entitled to "
@@ -3388,11 +3551,11 @@
 "않는다면, 여러분은 그들을 원하는 만큼 이용해 먹을 
자격이 있습니다. 다른 말"
 "로, 그것이 옳다고 가정하는 것입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope you disagree with that premise just as we do."
 msgstr "우리는 여러분이 그 전제에 우리처럼 동의하지 
않기를 바랍니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't you be better off not contradicting what so many people believe? "
 "<span class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)"
@@ -3401,7 +3564,7 @@
 "그냥 많은 사람들이 믿는 것을 반대하지 않는 편이 더 
좋지 않을까요?<span class="
 "\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't think we should go along with large numbers of people because they "
 "have been misled.  We hope you too will decide that truth is important."
@@ -3409,7 +3572,7 @@
 "우리는 잘못 인도된 많은 사람들과 함께 가야 한다고 
생각하지 않습니다. 우리는 "
 "여러분도 진실이 중요하다고 결심하기를 바랍니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We could never have developed a free operating system without first denying "
 "the belief, held by most people, that proprietary software was legitimate "
@@ -3418,7 +3581,7 @@
 "처음에 많은 사람들이 지닌 믿음, 즉 독점 소프트웨어가 ì 
ë‹¹í•˜ê³  받아들일 만하다"
 "는 믿음을 부인하지 않고서는 자유 운영체제를 개발하지 
못했을 것입니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
 "<span class=\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</"
@@ -3428,12 +3591,12 @@
 "지 않나요?<span class=\"anchor-reference-id\">(<a href=\"#somanyright"
 "\">#somanyright</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "We don't think that the popularity of an error makes it the truth."
 msgstr ""
 "우리는 오류가 대중적이라고 해서 그것이 진실이 된다고 
생각하지 않습니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it better to call the system by the name most users already know? "
 "<span class=\"anchor-reference-id\">(<a href=\"#knownname\">#knownname</a>)</"
@@ -3443,7 +3606,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#knownname\">#knownname</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo; includes "
 "&ldquo;Linux&rdquo;, they will recognize what you're talking about.  If you "
@@ -3455,7 +3618,7 @@
 "다. 만약 당신이 가끔&ldquo;(종종 &lsquo;Linux&rsquo;로 
잘못되게 여겨지는)"
 "&rdquo; 추가한다면, 그들은 이해할 것입니다."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many people care about what's convenient or who's winning, not about "
 "arguments of right or wrong.  Couldn't you get more of their support by a "
@@ -3467,19 +3630,31 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#winning\">#winning</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+# | To care only about what's convenient or who's winning is an amoral
+# | approach to life.  Non[---]free software is an example of that amoral
+# | approach and thrives on it.  Thus, in the long run it would be
+# | self-defeating for us to adopt that approach.  We will continue talking in
+# | terms of right and wrong.
+#, fuzzy
+#| msgid ""
+#| "To care only about what's convenient or who's winning is an amoral "
+#| "approach to life.  Non-free software is an example of that amoral "
+#| "approach and thrives on it.  Thus, in the long run it would be self-"
+#| "defeating for us to adopt that approach.  We will continue talking in "
+#| "terms of right and wrong."
 msgid ""
 "To care only about what's convenient or who's winning is an amoral approach "
-"to life.  Non-free software is an example of that amoral approach and "
-"thrives on it.  Thus, in the long run it would be self-defeating for us to "
-"adopt that approach.  We will continue talking in terms of right and wrong."
+"to life.  Nonfree software is an example of that amoral approach and thrives "
+"on it.  Thus, in the long run it would be self-defeating for us to adopt "
+"that approach.  We will continue talking in terms of right and wrong."
 msgstr ""
 "뭐가 편리하진 누가 이기는지에만 관심을 두는 것은 삶에 
대한 부도덕한 접근 방식"
 "입니다. 비자유 소프트웨어는 부도덕한 접근 방식의 
예이고 그 위에서 무성해집니"
 "다. 따라서 결국 우리가 그 접근 방식을 따르는 것은 
스스로 패배하는 것입니다. "
 "우리는 앞으로도 옳고 그름에 따라 이야기할 것입니다."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope that you are one of those for whom right and wrong do matter."
 msgstr "우리는 여러분이 옳고 그름을 중시하는 사람 중 한 명
이기를 바랍니다."
 
@@ -3529,16 +3704,15 @@
 "standards/README.translations.html\">번역 안내</a>를 참고해 
주세요."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2001, [-2006, 2007, 2008,-] {+2006-2008,+} 2010, 2011,
-# | 2013, [-2014, 2015-] {+2014-2018, 2020, 2021+} Free Software Foundation,
-# | Inc.
+# | Copyright &copy; [-2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015-]
+# | {+2001-2011, 2013-2018, 2020, 2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015 "
 #| "Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation, "
+"Inc."
 msgstr ""
 "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015 Free "
 "Software Foundation, Inc."

Index: gnu/po/gnu-linux-faq.nl-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.nl-diff.html,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- gnu/po/gnu-linux-faq.nl-diff.html   31 May 2021 09:06:17 -0000      1.47
+++ gnu/po/gnu-linux-faq.nl-diff.html   30 Aug 2021 13:34:53 -0000      1.48
@@ -10,35 +10,34 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.84</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&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.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;GNU/Linux FAQ
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/gnu/po/gnu-linux-faq.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;GNU/Linux FAQ 
by</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;GNU/Linux FAQ&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;GNU/Linux <span class="removed"><del><strong>FAQ 
by</strong></del></span> <span class="inserted"><ins><em>FAQ&lt;/h2&gt;
 
-&lt;address class="byline c"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;</strong></del></span> <span 
class="inserted"><ins><em>Stallman&lt;/address&gt;
+&lt;address class="byline"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;
 
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;To</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;To</em></ins></span> learn more about 
this issue, you can also read
+  &lt;blockquote&gt;&lt;p&gt;To learn more about this issue, you can also read
 our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
Project&lt;/a&gt;, our
  page on &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;
 and our page on &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU
-Users Who Have Never Heard of <span 
class="removed"><del><strong>GNU&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;</strong></del></span>
 <span class="inserted"><ins><em>GNU&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
-&lt;/div&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;
+Users Who Have Never Heard of GNU&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span> <span 
class="inserted"><ins><em>Stallman&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;
 When people see that we use and recommend the name GNU/Linux for a
 system that many others call just &ldquo;Linux&rdquo;, they ask many questions.
 Here are common questions, and our answers.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;div class="toc"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;h3 class="no-display"&gt;Table of Contents&lt;/h3&gt;</em></ins></span>
 &lt;ul&gt;
 
 &lt;li&gt;&lt;a href="#why"&gt;Why do you call the system we use GNU/Linux and 
not Linux?&lt;/a&gt;&lt;/li&gt;
@@ -299,7 +298,16 @@
     get more of their support by a different road?&lt;/a&gt;&lt;/li&gt;
 
 &lt;/ul&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;/div&gt;
+
+&lt;div class="announcement comment" role="complementary"&gt;
+&lt;p&gt;To learn more about this issue, you can also read
+our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
System&lt;/a&gt;, our
+ page on &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;
+and our page on &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU
+Users Who Have Never Heard of GNU&lt;/a&gt;.&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;</em></ins></span>
 
 &lt;dl&gt;
 
@@ -340,10 +348,16 @@
 
 &lt;dt id="what"&gt;What is the real relationship between GNU and Linux? 
&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#what"&gt;#what&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
-&lt;dd&gt;The GNU operating system and the Linux kernel are separate
+<span class="removed"><del><strong>&lt;dd&gt;The</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;dd&gt;
+&lt;p&gt;
+The</em></ins></span> GNU operating system and the Linux kernel are separate
 software projects that do complementary jobs.  Typically they are
 packaged in a &lt;a href="/distros/distros.html"&gt;GNU/Linux 
distribution&lt;/a&gt;, and used
-together.&lt;/dd&gt;
+<span class="removed"><del><strong>together.&lt;/dd&gt;</strong></del></span>
+<span class="inserted"><ins><em>together.&lt;/p&gt;
+&lt;/dd&gt;</em></ins></span>
 
 &lt;dt id="howerror"&gt;How did it come about that most
     people call the system &ldquo;Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#howerror"&gt;#howerror&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
@@ -456,11 +470,12 @@
           support an individual's free speech rights to call the system by
           any name that individual chooses? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#freespeech"&gt;#freespeech&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Yes, indeed, we believe you have a free speech right to call the
 operating system by any name you wish.  We ask that people call it
 GNU/Linux as a matter of doing justice to the GNU project, to promote
 the values of freedom that GNU stands for, and to inform others that
-those values of freedom brought the system into existence.
+those values of freedom brought the system into <span 
class="removed"><del><strong>existence.</strong></del></span> <span 
class="inserted"><ins><em>existence.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="everyoneknows"&gt;Since everyone knows
@@ -491,11 +506,12 @@
     why does it matter what name I use? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#everyoneknows2"&gt;#everyoneknows2&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 If your words don't reflect your knowledge, you don't teach others.
 Most people who have heard of the GNU/Linux system think it is
 &ldquo;Linux&rdquo;, that it was started by Linus Torvalds, and that
 it was intended to be &ldquo;open source&rdquo;.  If you don't tell
-them, who will?
+them, who <span class="removed"><del><strong>will?</strong></del></span> <span 
class="inserted"><ins><em>will?&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="windows"&gt;Isn't shortening &ldquo;GNU/Linux&rdquo;
@@ -602,19 +618,21 @@
 &lt;dt id="brain"&gt;Isn't the kernel the brain of the system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#brain"&gt;#brain&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 A computer system is not much like a human body,
 and no part of it plays a role comparable to that of
-the brain in a human.
+the brain in a <span class="removed"><del><strong>human.</strong></del></span> 
<span class="inserted"><ins><em>human.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="kernelmost"&gt;Isn't writing the kernel most of the work in an
 operating system? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#kernelmost"&gt;#kernelmost&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-No, many components take a lot of work.
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
+No, many components take a lot of <span 
class="removed"><del><strong>work.</strong></del></span> <span 
class="inserted"><ins><em>work.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="nokernel"&gt;An operating system 
requires a kernel.
+&lt;dt id="nokernel"&gt;An operating system requires a kernel.
     Since the GNU Project didn't develop a kernel, how can
     the system be GNU?&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#nokernel"&gt;#nokernel&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -633,10 +651,10 @@
 &lt;p&gt;
 Linus Torvalds made an important contribution to the operating system
 we use; the GNU Project started earlier and contributed much more.
-The name &ldquo;GNU/Linux&rdquo; gives credit to each.&lt;/p&gt;
+The name &ldquo;GNU/Linux&rdquo; gives credit to 
each.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="notinstallable"&gt;How can GNU be an
+&lt;dt id="notinstallable"&gt;How can GNU be an
     operating system, if I can't get something called &ldquo;GNU&rdquo;
     and install it? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#notinstallable"&gt;#notinstallable&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -697,11 +715,12 @@
     feel of Linux&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#feel"&gt;#feel&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 There is no such thing as the &ldquo;feel of Linux&rdquo; because
 Linux has no user interfaces.  Like any modern kernel, Linux is a base
 for running programs; user interfaces belong elsewhere in the system.
 Human interaction with GNU/Linux always goes through other programs,
-and the &ldquo;feel&rdquo; comes from them.
+and the &ldquo;feel&rdquo; comes from <span 
class="removed"><del><strong>them.</strong></del></span> <span 
class="inserted"><ins><em>them.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="long"&gt;The problem with &ldquo;GNU/Linux&rdquo; is that it is too 
long.
@@ -792,7 +811,8 @@
 may simply not recognize we're talking about the same system.  If we
 say &ldquo;GNU/Linux&rdquo;, they can make a connection to what they have heard
 about.&lt;/li&gt;
-&lt;/ul&gt;&lt;p&gt;&lt;/p&gt;
+<span 
class="removed"><del><strong>&lt;/ul&gt;&lt;p&gt;&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/ul&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="trademarkfee"&gt;I would have
@@ -846,11 +866,12 @@
     GNU/systemd/Linux? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#others"&gt;#others&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+&lt;p&gt;
 systemd is a fairly important component, but not as important as the
 kernel (Linux), nor as important as the basis of the system as a whole
 (GNU).  However, if you want to emphasize the presence of systemd
 by calling the system &ldquo;GNU/systemd/Linux&rdquo;, there is nothing
-wrong with doing so.
+wrong with doing so.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt</em></ins></span> id="others"&gt;Many other projects contributed to
@@ -922,8 +943,8 @@
 &lt;p&gt;
 We're not talking about a distinct GNU version of Linux, the kernel.
 The free GNU/Linux distros do have
-a &lt;a href="http://directory.fsf.org/project/linux"&gt;separate version of
-Linux&lt;/a&gt;, since the &ldquo;standard&rdquo; version contains non-free
+a &lt;a <span 
class="removed"><del><strong>href="http://directory.fsf.org/project/linux"&gt;separate</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://directory.fsf.org/wiki/Linux-libre"&gt;separate</em></ins></span>
 version of
+Linux&lt;/a&gt;, since the &ldquo;standard&rdquo; version contains <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
 firmware &ldquo;blobs&rdquo;.  If this were part of the GNU Project,
 it could be considered &ldquo;GNU Linux&rdquo;; but we would not want
 to call it that, because it would be too confusing.&lt;/p&gt;
@@ -1043,13 +1064,13 @@
     free software?  After all, that is the ideal of GNU. &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#reserve"&gt;#reserve&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-The widespread practice of adding non-free software to the GNU/Linux
+The widespread practice of adding <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software to the GNU/Linux
 system is a major problem for our community.  It teaches the users
-that non-free software is ok, and that using it is part of the spirit
+that <span class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software is ok, and that 
using it is part of the spirit
 of &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of 
their mission to
-help users use non-free add-ons, and may even invite salesmen to come
+help users use <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> add-ons, and may even 
invite salesmen to come
 and make sales pitches for them.  They adopt goals such as &ldquo;helping
-the users&rdquo; of GNU/Linux (including helping them use non-free
+the users&rdquo; of GNU/Linux (including helping them use <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
 applications and drivers), or making the system more popular even at
 the cost of freedom.
 &lt;p&gt;
@@ -1067,7 +1088,7 @@
 versions &lt;em&gt;are&lt;/em&gt; versions of GNU, that they all are based on a
 system that exists specifically for the sake of the users' freedom.
 With this understanding, they can start to recognize the distributions
-that include non-free software as perverted, adulterated versions of
+that include <span class="removed"><del><strong>non-free</strong></del></span> 
<span class="inserted"><ins><em>nonfree</em></ins></span> software as 
perverted, adulterated versions of
 GNU, instead of thinking they are proper and appropriate &ldquo;versions of
 Linux&rdquo;.&lt;/p&gt;
 &lt;p&gt;
@@ -1220,7 +1241,7 @@
 (there were already many of them, for various systems), but instead of
 calling it by a dull name like &ldquo;&lt;em&gt;somethingorother&lt;/em&gt; 
TECO&rdquo;, he
 thought of a clever amusing name.  (That's what hacking
-means: &lt;a href="http://stallman.org/articles/on-hacking.html"&gt;playful
+means: &lt;a <span 
class="removed"><del><strong>href="http://stallman.org/articles/on-hacking.html"&gt;playful</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://stallman.org/articles/on-hacking.html"&gt;playful</em></ins></span>
 cleverness&lt;/a&gt;.)&lt;/p&gt;
 &lt;p&gt;
 Other hackers enjoyed that name so much that we imitated the approach.
@@ -1246,7 +1267,7 @@
 We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems,
 because that term does not fit the history of the BSD systems.
 &lt;p&gt;
-The BSD system was developed by UC Berkeley as non-free software in
+The BSD system was developed by UC Berkeley as <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software in
 the 80s, and became free in the early 90s.  A free operating system
 that exists today is almost certainly either a variant of the GNU
 system, or a kind of BSD system.&lt;/p&gt;
@@ -1277,25 +1298,27 @@
 on Windows, does that mean I am running a GNU/Windows system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#othersys"&gt;#othersys&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of 
GNU
 are just a part of the GNU software, which is just a part of the GNU
 system, and underneath them you would still have another complete
 operating system which has no code in common with GNU.  All in all,
-that's a very different situation from GNU/Linux.
+that's a very different situation from <span 
class="removed"><del><strong>GNU/Linux.</strong></del></span> <span 
class="inserted"><ins><em>GNU/Linux.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="justlinux"&gt;Can't Linux be used without GNU? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#justlinux"&gt;#justlinux&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Linux is used by itself, or with small other programs, in some
 appliances.  These small software systems are a far cry from the
 GNU/Linux system.  Users do not install them on PCs, for instance, and
 would find them rather disappointing.  It is useful to say that these
 appliances run just Linux, to show how different those small platforms
-are from GNU/Linux.
+are from <span class="inserted"><ins><em>GNU/Linux.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="howmuch"&gt;How much of the GNU 
system is needed for the system
+&lt;dt id="howmuch"&gt;How much of the GNU system is needed for the system
 to be
 GNU/Linux? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#howmuch"&gt;#howmuch&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -1306,17 +1329,17 @@
 GNU is an operating system maintained by a community.  It includes far
 more than just the GNU software packages (of which we have a specific
 list), and people add more packages constantly.  Despite these
-changes, it remains the GNU system, and adding Linux to that yields
-GNU/Linux.  If you use part of the GNU system and omit part, there is
+changes, it remains the GNU system, and adding Linux to that 
yields</em></ins></span>
+GNU/Linux.  <span class="inserted"><ins><em>If you use part of the GNU system 
and omit part, there is
 no meaningful way to say &ldquo;how much&rdquo; you used.&lt;/p&gt;
 &lt;p&gt;
 If we look at the level of packages, Linux is one important package in
 the GNU/Linux system.  The inclusion of one important GNU package is
 enough to justify our request for equal mention.
-&lt;/p&gt;
+&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="linuxsyswithoutgnu"&gt;Are there complete Linux 
systems [sic] without GNU? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#linuxsyswithoutgnu"&gt;#linuxsyswithoutgnu&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+&lt;dt id="linuxsyswithoutgnu"&gt;Are there complete Linux systems [sic] 
without GNU? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#linuxsyswithoutgnu"&gt;#linuxsyswithoutgnu&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
 There are complete systems that contain Linux and not GNU; Android is
@@ -1396,10 +1419,11 @@
 &ldquo;Linux&rdquo; with that principle.
 &lt;p&gt;
 Linus publicly states his disagreement with the free software
-movement's ideals.  He developed non-free software in his job for many
+movement's ideals.  He developed <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software in his job for many
 years (and said so to a large audience at a &ldquo;Linux&rdquo;World show), and
 publicly invited fellow developers of Linux, the kernel, to use
-non-free software to work on it with him.  He goes even further, and
+<span class="removed"><del><strong>non-free</strong></del></span>
+<span class="inserted"><ins><em>nonfree</em></ins></span> software to work on 
it with him.  He goes even further, and
 rebukes people who suggest that engineers and scientists should
 consider social consequences of our technical work&mdash;rejecting the
 lessons society learned from the development of the atom bomb.&lt;/p&gt;
@@ -1418,11 +1442,13 @@
     work as GNU? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#claimlinux"&gt;#claimlinux&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 It would be wrong, so we don't do that.  Torvalds' work is Linux, the
 kernel; we are careful not to attribute that work to the GNU Project
 or label it as &ldquo;GNU&rdquo;.  When we talk about the whole
 system, the name &ldquo;GNU/Linux&rdquo; gives him a share of the
-credit.
+<span class="removed"><del><strong>credit.</strong></del></span>
+<span class="inserted"><ins><em>credit.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 
@@ -1432,7 +1458,8 @@
 &lt;dd&gt;
 &lt;p&gt;He recognized this at the beginning.  The earliest Linux release notes
 said, &lt;a
-href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+<span 
class="removed"><del><strong>href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
 &ldquo;Most of the tools used with linux are GNU software and are under the
 GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
 for more info&rdquo;&lt;/a&gt;.&lt;/p&gt;
@@ -1450,7 +1477,7 @@
 a big job, and it's not clearly necessary.  The only thing ethically
 wrong with Linux as a kernel is its inclusion of firmware
 &ldquo;blobs&rdquo;; the best fix for that problem
-is &lt;a href="http://fsf.org/campaigns/priority-projects"&gt; developing
+is &lt;a <span 
class="removed"><del><strong>href="http://fsf.org/campaigns/priority-projects"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.fsf.org/campaigns/priority-projects"&gt;</em></ins></span>
 developing
 free replacement for the blobs&lt;/a&gt;.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -1459,12 +1486,13 @@
     it? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#lost"&gt;#lost&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 This isn't a battle, it is a campaign of education.  What to call the
 system is not a single decision, to be made at one moment by
 &ldquo;society&rdquo;: each person, each organization, can decide what
 name to use.  You can't make others say &ldquo;GNU/Linux&rdquo;, but
 you can decide to call the system &ldquo;GNU/Linux&rdquo;
-yourself&mdash;and by doing so, you will help educate others.
+yourself&mdash;and by doing so, you will help educate <span 
class="removed"><del><strong>others.</strong></del></span> <span 
class="inserted"><ins><em>others.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="whatgood"&gt;Society has made its
@@ -1472,6 +1500,7 @@
     &ldquo;GNU/Linux&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#whatgood"&gt;#whatgood&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 This is not an all-or-nothing situation: correct and incorrect
 pictures are being spread more or less by various people.  If you call
 the system &ldquo;GNU/Linux&rdquo;, you will help others learn the system's 
true
@@ -1479,7 +1508,7 @@
 everywhere on your own, any more than we can, but you can help.  If
 only a few hundred people see you use the term &ldquo;GNU/Linux&rdquo;, you 
will
 have educated a substantial number of people with very little work.
-And some of them will spread the correction to others.
+And some of them will spread the correction to <span 
class="removed"><del><strong>others.</strong></del></span> <span 
class="inserted"><ins><em>others.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="explain"&gt;Wouldn't it be better to call
@@ -1550,39 +1579,44 @@
     is it legitimate to rename the operating system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#rename"&gt;#rename&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 We are not renaming anything; we have been calling this system 
&ldquo;GNU&rdquo;
 ever since we announced it in 1983.  The people who tried to rename
-it to &ldquo;Linux&rdquo; should not have done so.&lt;/dd&gt;
+it to &ldquo;Linux&rdquo; should not have done <span 
class="removed"><del><strong>so.&lt;/dd&gt;</strong></del></span> <span 
class="inserted"><ins><em>so.&lt;/p&gt;
+&lt;/dd&gt;</em></ins></span>
 
 &lt;dt id="force"&gt;Isn't it wrong to force people to call
 the system &ldquo;GNU/Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#force"&gt;#force&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 It would be wrong to force them, and we don't try.  We call the system
-&ldquo;GNU/Linux&rdquo;, and we ask you to do it too.
+&ldquo;GNU/Linux&rdquo;, and we ask you to do it <span 
class="removed"><del><strong>too.</strong></del></span> <span 
class="inserted"><ins><em>too.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="whynotsue"&gt;Why not sue people who call
 the whole system &ldquo;Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#whynotsue"&gt;#whynotsue&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 There are no legal grounds to sue them, but since we believe in
 freedom of speech, we wouldn't want to do that anyway.  We ask people
-to call the system &ldquo;GNU/Linux&rdquo; because that is the right thing to 
do.
+to call the system &ldquo;GNU/Linux&rdquo; because that is the right thing to 
<span class="removed"><del><strong>do.</strong></del></span> <span 
class="inserted"><ins><em>do.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="require"&gt;Shouldn't you put something in
     the GNU GPL to require people to call the system &ldquo;GNU&rdquo;? 
&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#require"&gt;#require&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 The purpose of the GNU GPL is to protect the users' freedom from those
 who would make proprietary versions of free software.  While it is
 true that those who call the system &ldquo;Linux&rdquo; often do things that 
limit
-the users' freedom, such as bundling non-free software with the
-GNU/Linux system or even developing non-free software for such use,
+the users' freedom, such as bundling <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software with the
+GNU/Linux system or even developing <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software for such use,
 the mere act of calling the system &ldquo;Linux&rdquo; does not, in itself, 
deny
 users their freedom.  It seems improper to make the GPL restrict what
-name people can use for the system.
+name people can use for the <span 
class="removed"><del><strong>system.</strong></del></span> <span 
class="inserted"><ins><em>system.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="BSDlicense"&gt;Since you objected to the original BSD license's
@@ -1630,17 +1664,19 @@
 it &ldquo;Linux&rdquo;, doesn't that make it right? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#somanyright"&gt;#somanyright&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-We don't think that the popularity of an error makes it the truth.
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
+We don't think that the popularity of an error makes it the <span 
class="removed"><del><strong>truth.</strong></del></span> <span 
class="inserted"><ins><em>truth.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="knownname"&gt;Isn't it better to call the
     system by the name most users already know? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#knownname"&gt;#knownname&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo;
 includes &ldquo;Linux&rdquo;, they will recognize what you're talking
 about.  If you add &ldquo;(often erroneously referred to as
-&lsquo;Linux&rsquo;)&rdquo; once in a while, they will all understand.
+&lsquo;Linux&rsquo;)&rdquo; once in a while, they will all <span 
class="removed"><del><strong>understand.</strong></del></span> <span 
class="inserted"><ins><em>understand.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="winning"&gt;Many people care about what's
@@ -1650,7 +1686,7 @@
 
 &lt;dd&gt;
 To care only about what's convenient or who's winning is an amoral
-approach to life.  Non-free software is an example of that amoral
+approach to life.  <span 
class="removed"><del><strong>Non-free</strong></del></span>  <span 
class="inserted"><ins><em>Nonfree</em></ins></span> software is an example of 
that amoral
 approach and thrives on it.  Thus, in the long run it would be
 self-defeating for us to adopt that approach.  We will continue
 talking in terms of right and wrong.
@@ -1659,8 +1695,7 @@
 &lt;/dd&gt;
 
 &lt;/dl&gt;
-<span class="inserted"><ins><em>&lt;/div&gt;
-&lt;/div&gt;</em></ins></span>
+<span class="inserted"><ins><em>&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;
@@ -1709,7 +1744,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2001, <span class="removed"><del><strong>2006, 2007, 
2008,</strong></del></span> <span 
class="inserted"><ins><em>2006-2008,</em></ins></span> 2010, 2011, 2013, <span 
class="removed"><del><strong>2014, 2015, 2016, 2017</strong></del></span> <span 
class="inserted"><ins><em>2014-2018, 2020, 2021</em></ins></span>
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>2001, 2006, 2007, 
2008, 2010, 2011, 2013, 2014, 2015, 2016, 2017</strong></del></span> <span 
class="inserted"><ins><em>2001-2011, 2013-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"
@@ -1720,7 +1755,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/31 09:06:17 $
+$Date: 2021/08/30 13:34:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: gnu/po/gnu-linux-faq.nl.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.nl.po,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- gnu/po/gnu-linux-faq.nl.po  30 May 2021 20:26:35 -0000      1.65
+++ gnu/po/gnu-linux-faq.nl.po  30 Aug 2021 13:34:53 -0000      1.66
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Justin van Steijn <jvs@fsfe.org>\n"
 "Language-Team: Dutch\n"
@@ -25,32 +25,18 @@
 msgid "GNU/Linux FAQ - GNU Project - Free Software Foundation"
 msgstr "GNU/Linux veelgestelde vragen - GNU-project - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU/Linux FAQ"
 msgstr ""
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 # || No change detected.  The change might only be in amounts of spaces.
 #, fuzzy
 #| msgid "by Richard Stallman"
 msgid "by Richard Stallman"
 msgstr "door Richard Stallman"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
-"linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a href=\"/"
-"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Om meer over dit onderwerp te weten te komen kun je ook <a href=\"/gnu/linux-"
-"and-gnu.html\">Linux en het GNU-project</a> lezen, of ons artikel <a href=\"/"
-"gnu/why-gnu-linux.html\">Waarom GNU/Linux?</a> en ons artikel over <a href="
-"\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU-gebruikers die nog nooit van "
-"GNU gehoord hebben</a>."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When people see that we use and recommend the name GNU/Linux for a system "
 "that many others call just &ldquo;Linux&rdquo;, they ask many questions.  "
@@ -60,6 +46,13 @@
 "aanduidt met &ldquo;Linux&rdquo;, GNU/Linux te noemen komen er veel vragen "
 "los. Hier een aantal van die vragen en onze antwoorden daarop."
 
+#. type: Content of: <div><div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "Inhoudsopgave"
+
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<a href=\"#why\">Why do you call the system we use GNU/Linux and not Linux?</"
@@ -672,7 +665,34 @@
 "wint, niet wie er gelijk heeft of niet. Kun je niet beter op een andere "
 "manier hun steun verwerven?</a>"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
+# | {+System</a>,+} our page on <a href=\"/gnu/why-gnu-linux.html\">Why
+# | GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our page on <a href=\"/"
+#| "gnu/linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a "
+#| "href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
+"linux-and-gnu.html\">Linux and the GNU System</a>, our page on <a href=\"/"
+"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Om meer over dit onderwerp te weten te komen kun je ook <a href=\"/gnu/linux-"
+"and-gnu.html\">Linux en het GNU-project</a> lezen, of ons artikel <a href=\"/"
+"gnu/why-gnu-linux.html\">Waarom GNU/Linux?</a> en ons artikel over <a href="
+"\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU-gebruikers die nog nooit van "
+"GNU gehoord hebben</a>."
+
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you call the system we use GNU/Linux and not Linux? <span class="
 "\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>"
@@ -680,7 +700,7 @@
 "Waarom noem je het systeem dat we gebruiken GNU/Linux en niet Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Most operating system distributions based on Linux as kernel are basically "
 "modified versions of the GNU operating system.  We began developing GNU in "
@@ -699,11 +719,11 @@
 "meeste van de centrale onderdelen, de grootste bijdrage aan het systeem. De "
 "visie was de onze."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "In fairness, we ought to get at least equal mention."
 msgstr "De naamgeving zou dit moeten weergeven."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and the GNU System</a> and <a "
 "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
@@ -715,7 +735,7 @@
 "van GNU gehoord hebben</a> voor verdere uitleg en <a href= \"/gnu/the-gnu-"
 "project.html\">Het GNU-project</a> voor de geschiedenis."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why is the name important? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
@@ -723,7 +743,7 @@
 "Waarom is de naam van belang? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Although the developers of Linux, the kernel, are contributing to the free "
 "software community, many of them do not care about freedom.  People who "
@@ -737,7 +757,7 @@
 "verwarren met het vrijheidsstreven van de gemeenschap. Daarmee krijgt de rol "
 "van die ontwikkelaars een onevenredig groot gewicht toegekend."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Calling the system GNU/Linux recognizes the role that our idealism played in "
 "building our community, and <a href=\"/gnu/why-gnu-linux.html\">helps the "
@@ -748,7 +768,7 @@
 "gnu-linux.html\">helpt daarmee iedereen het belang te laten inzien van die "
 "idealen</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the real relationship between GNU and Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#what\">#what</a>)</span>"
@@ -756,7 +776,7 @@
 "Wat is de echte relatie tussen GNU en Linux? <span class=\"anchor-reference-"
 "id\">(<a href=\"#what\">#what</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU operating system and the Linux kernel are separate software projects "
 "that do complementary jobs.  Typically they are packaged in a <a href=\"/"
@@ -767,7 +787,7 @@
 "<a href=\"/distros/distros.html\">GNU/Linux-distributie</a> en samen "
 "gebruikt."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How did it come about that most people call the system &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
@@ -776,7 +796,7 @@
 "Hoe kom het dat de meeste mensen het &ldquo;Linux&rdquo; noemen? <span class="
 "\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; is a confusion that has spread faster "
 "than the corrective information."
@@ -784,7 +804,7 @@
 "Het systeem &ldquo;Linux&rdquo; noemen is een misvatting die zich sneller "
 "heeft verspreid dan dat het gecorrigeerd kon worden."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who combined Linux with the GNU system were not aware that that's "
 "what their activity amounted to.  They focused their attention on the piece "
@@ -803,7 +823,7 @@
 "naam te gebruiken. Op dat moment had de misvatting inmiddels een behoorlijke "
 "voorsprong."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the people who call the system &ldquo;Linux&rdquo; have never heard "
 "why that's not the right thing.  They saw others using that name and assume "
@@ -823,7 +843,7 @@
 "1991. Deze foute veronderstelling versterkt het verkeerde idee dat het "
 "systeem &ldquo;Linux&rdquo; genoemd zou moeten worden."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Many of the questions in this file represent people's attempts to justify "
 "the name they are accustomed to using."
@@ -831,7 +851,7 @@
 "Een hoop vragen in dit artikel gaan over de pogingen van mensen om het "
 "gebruik van die naam waaraan ze gewend zijn geraakt, goed te praten."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we always say &ldquo;GNU/Linux&rdquo; instead of &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
@@ -840,7 +860,7 @@
 "Linux&rdquo;? <span class=\"anchor-reference-id\">(<a href=\"#always"
 "\">#always</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not always&mdash;only when you're talking about the whole system.  When "
 "you're referring specifically to the kernel, you should call it &ldquo;"
@@ -850,7 +870,7 @@
 "je het alleen over de kernel hebt moet je het wel &ldquo;Linux&rdquo; "
 "noemen, de naam die de ontwikkelaar eraan heeft gegeven."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
 "call the whole system by the same name as the kernel.  This causes many "
@@ -865,7 +885,7 @@
 "geheel. Door het geheel &ldquo;GNU/Linux&rdquo; te noemen en de kernel "
 "&ldquo;Linux&rdquo;, vermijd je deze spraakverwarring."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Would Linux have achieved the same success if there had been no GNU? <span "
 "class=\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</"
@@ -874,7 +894,7 @@
 "Zou Linux net zo'n groot succes zijn geweest zonder GNU? <span class="
 "\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In that alternative world, there would be nothing today like the GNU/Linux "
 "system, and probably no free operating system at all.  No one attempted to "
@@ -888,7 +908,7 @@
 "project, later gevolgd door Berkeley CSRG omdat wij ze vroegen hun code vrij "
 "te geven."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds was partly influenced by a speech about GNU in Finland in "
 "1990.  It's possible that even without this influence he might have written "
@@ -903,7 +923,7 @@
 "1992 toen Linus het uitbracht onder de GNU GPL (zie de release notes van "
 "versie 0.12)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Even if Torvalds had released Linux under some other free software license, "
 "a free kernel alone would not have made much difference to the world.  The "
@@ -915,7 +935,7 @@
 "Linux zit alleen in het inpassen ervan in het raamwerk van GNU om zo een "
 "compleet vrij besturingssysteem te maken: GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better for the community if you did not divide people with "
 "this request? <span class=\"anchor-reference-id\">(<a href=\"#divide"
@@ -925,7 +945,7 @@
 "laat rusten? <span class=\"anchor-reference-id\">(<a href=\"#divide"
 "\">#divide</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
 "people.  We are asking them to give the GNU Project credit for the GNU "
@@ -936,7 +956,7 @@
 "die het verdient voor het GNU-besturingssysteem. Dit is geen kritiek op "
 "iemand noch strijkt het iemand tegen de haren in."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, there are people who do not like our saying this.  Sometimes those "
 "people push us away in response.  On occasion they are so rude that one "
@@ -950,7 +970,7 @@
 "worden daar niet stil van maar het verdeeld de gemeenschap wel. We hopen dus "
 "dat jij ze misschien kan overtuigen hiermee te stoppen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, this is only a secondary cause of division in our community.  The "
 "largest division in the community is between people who appreciate free "
@@ -966,7 +986,7 @@
 "praktische voordelen zien in vrije software als effici&euml;nt "
 "ontwikkelmodel (de open bron beweging)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This disagreement is not just a matter of names&mdash;it is a matter of "
 "differing basic values.  It is essential for the community to see and think "
@@ -982,7 +1002,7 @@
 "\"/philosophy/open-source-misses-the-point.html\">Open Source begrijpt het "
 "niet</a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The disagreement over values partially aligns with the amount of attention "
 "people pay to the GNU Project's role in our community.  People who value "
@@ -1009,7 +1029,7 @@
 "makkelijk zal zijn)  of wanneer we volledig worden overstemd door "
 "tegenkrachten (laten we dat laatste niet hopen)."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Doesn't the GNU project support an individual's free speech rights to call "
 "the system by any name that individual chooses? <span class=\"anchor-"
@@ -1019,7 +1039,7 @@
 "recht het systeem welke naam dan ook te geven? <span class=\"anchor-"
 "reference-id\">(<a href=\"#freespeech\">#freespeech</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Yes, indeed, we believe you have a free speech right to call the operating "
 "system by any name you wish.  We ask that people call it GNU/Linux as a "
@@ -1034,7 +1054,7 @@
 "worden uitgedragen.  En om anderen eraan te helpen herinneren dat die "
 "waarden dit systeem hebben opgeleverd."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since everyone knows the role of GNU in developing the system, doesn't the "
 "&ldquo;GNU/&rdquo; in the name go without saying? <span class=\"anchor-"
@@ -1044,7 +1064,7 @@
 "spreekt het &ldquo;GNU/&rdquo; dan niet vanzelf? <span class=\"anchor-"
 "reference-id\">(<a href=\"#everyoneknows\">#everyoneknows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Experience shows that the system's users, and the computer-using public in "
 "general, often know nothing about the GNU system.  Most articles about the "
@@ -1058,7 +1078,7 @@
 "staat. <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Gebruikers Die "
 "Nog Nooit Van GNU Gehoord Hebben</a> legt dit verder uit."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who say this are probably geeks thinking of the geeks they know.  "
 "Geeks often do know about GNU, but many have a completely wrong idea of what "
@@ -1072,7 +1092,7 @@
 "hulpmiddelen&rdquo;</a> is, of een project om die hulpmiddelen te "
 "ontwikkelen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The wording of this question, which is typical, illustrates another common "
 "misconception.  To speak of &ldquo;GNU's role&rdquo; in developing something "
@@ -1086,7 +1106,7 @@
 "besturingssysteem. Dus kan men beter praten over de rol van het GNU "
 "<em>project</em> in deze."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since I know the role of GNU in this system, why does it matter what name I "
 "use? <span class=\"anchor-reference-id\">(<a href="
@@ -1096,7 +1116,7 @@
 "ik gebruik? <span class=\"anchor-reference-id\">(<a href="
 "\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your words don't reflect your knowledge, you don't teach others.  Most "
 "people who have heard of the GNU/Linux system think it is &ldquo;"
@@ -1109,7 +1129,7 @@
 "door Linus Torvalds en dat de bedoeling ervan &ldquo;open source&rdquo; was. "
 "Wanneer jij het ze niet vertelt, wie dan wel?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't shortening &ldquo;GNU/Linux&rdquo; to &ldquo;Linux&rdquo; just like "
 "shortening &ldquo;Microsoft Windows&rdquo; to &ldquo;Windows&rdquo;? <span "
@@ -1120,7 +1140,7 @@
 "Windows&rdquo;? <span class=\"anchor-reference-id\">(<a href=\"#windows"
 "\">#windows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It's useful to shorten a frequently-used name, but not if the abbreviation "
 "is misleading."
@@ -1128,7 +1148,7 @@
 "Het is nuttig om een veelgebruikte naam in te korten, maar niet wanneer dat "
 "verkorten aanleiding geeft tot misverstanden."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Almost everyone in developed countries really does know that the &ldquo;"
 "Windows&rdquo; system is made by Microsoft, so shortening &ldquo;Microsoft "
@@ -1141,7 +1161,7 @@
 "misverstanden leiden. Het inkorten van &ldquo;GNU/Linux&rdquo; tot &ldquo;"
 "Linux&rdquo; cre&euml;ert dat misverstand w&eacute;l."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The question is itself misleading because GNU and Microsoft are not the same "
 "kind of thing.  Microsoft is a company; GNU is an operating system."
@@ -1149,7 +1169,7 @@
 "De vraag zelf is ook al misleidend omdat GNU en Microsoft niet hetzelfde "
 "zijn.  Microsoft is een bedrijf, GNU is een besturingssysteem."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't GNU a collection of programming tools that were included in Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
@@ -1158,7 +1178,7 @@
 "ondergebracht? <span class=\"anchor-reference-id\">(<a href=\"#tools"
 "\">#tools</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "People who think that Linux is an entire operating system, if they hear "
 "about GNU at all, often get a wrong idea of what GNU is.  They may think "
@@ -1177,7 +1197,7 @@
 "moeilijk te rijmen met de misvatting dat het besturingssysteem &ldquo;"
 "Linux&rdquo; heet."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Project was named after the GNU operating system&mdash;it's the "
 "project to develop the GNU system.  (See <a href=\"/gnu/initial-announcement."
@@ -1187,7 +1207,7 @@
 "het project om het GNU-systeem te ontwikkelen (zie ook <a href=\"/gnu/"
 "initial-announcement.html\">de eerste oproep uit 1983</a>)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We developed programs such as GCC, GNU Emacs, GAS, GLIBC, BASH, etc., "
 "because we needed them for the GNU operating system.  GCC, the GNU Compiler "
@@ -1202,7 +1222,7 @@
 "ontwikkelden voor het GNU-systeem ook Ghostscript, GNUCash, GNU Chess en "
 "GNOME."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the difference between an operating system and a kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
@@ -1210,7 +1230,7 @@
 "Wat is het verschil tussen een besturingssysteem en een kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "An operating system, as we use the term, means a collection of programs that "
 "are sufficient to use the computer to do a wide variety of jobs.  A general "
@@ -1222,7 +1242,7 @@
 "toepassingen.  Een algemeen besturingssysteem moet in staat zijn om alle "
 "toepassingen te kunnen draaien die een gebruiker maar wil."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The kernel is one of the programs in an operating system&mdash;the program "
 "that allocates the machine's resources to the other programs that are "
@@ -1233,7 +1253,7 @@
 "maakt voor de andere programma's die lopen. De kernel zorgt ook voor het "
 "starten en stoppen van de programma's."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "To confuse matters, some people use the term &ldquo;operating system&rdquo; "
 "to mean &ldquo;kernel&rdquo;.  Both uses of the term go back many years.  "
@@ -1255,7 +1275,7 @@
 "bedoelen we dat dus wanneer we het woord &ldquo;besturingssysteem&rdquo; "
 "gebruiken."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the time when people speak of the &ldquo;Linux operating "
 "system&rdquo; they are using &ldquo;operating system&rdquo; in the same "
@@ -1273,7 +1293,7 @@
 "is &ldquo;Linux&rdquo; de juiste benaming, gebruik daarbij alsjeblieft ook "
 "het woord &ldquo;kernel&rdquo; om misverstanden uit te sluiten."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
@@ -1284,7 +1304,7 @@
 "je verzameling programma's in plaats van &ldquo;besturingssysteem&rdquo; ga "
 "dan vooral je gang. Je hebt het dan over GNU/Linux distributies."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The kernel of a system is like the foundation of a house.  How can a house "
 "be almost complete when it doesn't have a foundation? <span class=\"anchor-"
@@ -1294,7 +1314,7 @@
 "bijna af zijn wanneer het geen fundering heeft? <span class=\"anchor-"
 "reference-id\">(<a href=\"#house\">#house</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "A kernel is not much like the foundation of a house because building an "
 "operating system is not much like building a house."
@@ -1303,7 +1323,7 @@
 "bouwen van een besturingssysteem totaal anders is als het bouwen van een "
 "huis."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A house is built from lots of little general parts that are cut and put "
 "together in situ.  They have to be put together from the bottom up.  Thus, "
@@ -1315,7 +1335,7 @@
 "dus nog geen groot deel van het huis gebouwd; het enige wat je hebt is een "
 "gat in de grond."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "By contrast, an operating system consists of complex components that can be "
 "developed in any order.  When you have developed most of the components, "
@@ -1331,7 +1351,7 @@
 "heel aantal modules die reeds in de ruimte zijn geschoten maar het wachten "
 "is nog op een essentieel onderdeel, analoog aan het GNU-systeem in 1992."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't the kernel the brain of the system? <span class=\"anchor-reference-id"
 "\">(<a href=\"#brain\">#brain</a>)</span>"
@@ -1339,7 +1359,7 @@
 "Vormt de kernel niet het brein van het systeem? <span class=\"anchor-"
 "reference-id\">(<a href=\"#brain\">#brain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A computer system is not much like a human body, and no part of it plays a "
 "role comparable to that of the brain in a human."
@@ -1347,7 +1367,7 @@
 "Een computersysteem lijkt niet op het menselijk lichaam en geen enkel "
 "onderdeel kun je vergelijken met het brein."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't writing the kernel most of the work in an operating system? <span "
 "class=\"anchor-reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</"
@@ -1357,11 +1377,11 @@
 "besturingssysteem? <span class=\"anchor-reference-id\">(<a href=\"#kernelmost"
 "\">#kernelmost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "No, many components take a lot of work."
 msgstr "Nee, veel onderdelen vergen veel werk."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Isn't writing-]{+An operating system requires a kernel.  Since+} the
 # | [-kernel most of-] {+GNU Project didn't develop a kernel, how can+} the
 # | [-work in an operating system? <span-] {+system be GNU?<span+}
@@ -1382,7 +1402,7 @@
 "besturingssysteem? <span class=\"anchor-reference-id\">(<a href=\"#kernelmost"
 "\">#kernelmost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The people who argue that way for calling the system &ldquo;Linux&rdquo; are "
 "using a double standard.  An operating system requires compilers, editors, "
@@ -1391,13 +1411,13 @@
 "any of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "That standard is too strict, not the right way to judge the contributions of "
 "any contributor."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds made an important contribution to the operating system we "
 "use; the GNU Project started earlier and contributed much more.  The name "
@@ -1405,7 +1425,7 @@
 msgstr ""
 
 # Nieuw
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How can GNU be an operating system, if I can't get something called &ldquo;"
 "GNU&rdquo; and install it? <span class=\"anchor-reference-id\">(<a href="
@@ -1416,7 +1436,7 @@
 "id\">(<a href=\"#notinstallable\">#notinstallable</a>)</span>"
 
 # Nieuw
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Many <a href=\"/distros/distros.html\"> packaged and installable versions of "
 "GNU</a> are available.  None of them is called simply &ldquo;GNU&rdquo;, but "
@@ -1427,7 +1447,7 @@
 "genoemd, maar in de basis zijn zij allemaal GNU."
 
 # Nieuw
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We expected to release the GNU system packaged for installation, but this "
 "plan was overtaken by events: in 1992 others were already packaging GNU "
@@ -1448,7 +1468,7 @@
 "naam zou moeten worden van een systeem met de kernel GNU Hurd&mdash;die nog "
 "niet klaar was."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Hurd kernel never became sufficiently ready; we only recommend it to "
 "those interested in working on it.  So we never packaged GNU with the GNU "
@@ -1460,7 +1480,7 @@
 "die bekend staat als Debian GNU/Hurd."
 
 # Nieuw
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are now developing an advanced Scheme-based package manager called Guix "
 "and a complete system distribution based on it called the <a href=\"/"
@@ -1473,7 +1493,7 @@
 "substantieel gedeelte van het GNU-systeem."
 
 # Nieuw
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We never took the last step of packaging GNU under the name &ldquo;"
 "GNU&rdquo;, but that doesn't alter what kind of thing GNU is.  GNU is an "
@@ -1483,7 +1503,7 @@
 "GNU&rdquo; in te pakken, maar dat verandert niet wat GNU is. GNU is een "
 "besturingssysteem."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "We're calling the whole system after the kernel, Linux.  Isn't it normal to "
 "name an operating system after a kernel? <span class=\"anchor-reference-id\">"
@@ -1493,7 +1513,7 @@
 "gebruikelijk om het systeem naar de kernel te vernoemen? <span class="
 "\"anchor-reference-id\">(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "That practice seems to be very rare&mdash;we can't find any examples other "
 "than the misuse of the name &ldquo;Linux&rdquo;.  Normally an operating "
@@ -1509,7 +1529,7 @@
 "meestal geen eigen naam&mdash;mensen hebben het dan over de &ldquo;kernel "
 "van die-en-die&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Because those two constructions are used synonymously, the expression &ldquo;"
 "the Linux kernel&rdquo; can easily be misunderstood as meaning &ldquo;the "
@@ -1524,7 +1544,7 @@
 "Linux, de kernel&rdquo;."
 
 # Nieuw
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can another system have &ldquo;the feel of Linux&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
@@ -1533,7 +1553,7 @@
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
 
 # Nieuw
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is no such thing as the &ldquo;feel of Linux&rdquo; because Linux has "
 "no user interfaces.  Like any modern kernel, Linux is a base for running "
@@ -1547,7 +1567,7 @@
 "anders in het systeem. Menselijke interactie met GNU/Linux gaat altijd via "
 "andere programma's, en het &ldquo;gevoel&rdquo; komt daarvan."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  How about "
 "recommending a shorter name? <span class=\"anchor-reference-id\">(<a href="
@@ -1557,7 +1577,7 @@
 "iets korters? <span class=\"anchor-reference-id\">(<a href=\"#long\">#long</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "For a while we tried the name &ldquo;LiGNUx&rdquo;, which combines the words "
 "&ldquo;GNU&rdquo; and &ldquo;Linux&rdquo;.  The reaction was very bad.  "
@@ -1567,7 +1587,7 @@
 "GNU&rdquo; en &ldquo;Linux&rdquo; combineert. De reacties waren niet best. "
 "Mensen zijn meer geneigd GNU/Linux te accepteren."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
 "call it &ldquo;GNU/Linux&rdquo; <a href=\"#justgnu\"> for the reasons given "
@@ -1577,7 +1597,7 @@
 "noemen het &ldquo;GNU/Linux&rdquo;.  Zie het <a href=\"#justgnu\"> volgende "
 "antwoord voor het waarom</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How about calling the system &ldquo;GliNUx&rdquo; (instead of &ldquo;GNU/"
 "Linux&rdquo;)? <span class=\"anchor-reference-id\">(<a href="
@@ -1587,7 +1607,7 @@
 "GNU/Linux&rdquo;)? <span class=\"anchor-reference-id\">(<a href="
 "\"#long1\">#long1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The name &ldquo;GNU&rdquo; does not visibly appear in &ldquo;Glinux,&rdquo; "
 "so most people would not notice it is there.  Even if it is capitalized as "
@@ -1599,7 +1619,7 @@
 "als het met hoofdletters geschreven als in &ldquo;GliNUx,&rdquo; zullen de "
 "meeste mensen niet realiseren dat het verwijst naar GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be comparable to writing &ldquo;GNU/Linux,&rdquo; but putting "
 "&ldquo;GNU/&rdquo; in print so small that most people could not read it."
@@ -1608,7 +1628,7 @@
 "GNU/&rdquo; zo klein is afgedrukt dat de meeste mensen het niet kunnen lezen."
 
 # Nieuw
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  Why should "
 "I go to the trouble of saying &ldquo;GNU/&rdquo;? <span class=\"anchor-"
@@ -1619,7 +1639,7 @@
 "reference-id\">(<a href=\"#long2\">#long2</a>)</span>"
 
 # Nieuw
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
 "the system that we developed, can't you take one second to recognize our "
@@ -1630,7 +1650,7 @@
 "&eacute;&eacute;n seconde opbrengen om ons werk te erkennen?"
 
 # Nieuw
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Unfortunately, &ldquo;GNU/Linux&rdquo; is five syllables. People won't use "
 "such a long term. Shouldn't you find a shorter one? <span class=\"anchor-"
@@ -1642,7 +1662,7 @@
 "span>"
 
 # Nieuw
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, &ldquo;GNU/Linux&rdquo; is only four syllables.  &ldquo;"
 "Unfortunately&rdquo; is five syllables, yet people show no sign of "
@@ -1652,7 +1672,7 @@
 "Betreurenswaardig&rdquo; heeft w&eacute;l vijf lettergrepen, en toch "
 "gebruiken mensen dat woord nog steeds."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-How about calling-]{+Stallman doesn't ask us to call him &ldquo;Richard
 # | Matthew Stallman&rdquo; every+} the [-system &ldquo;GliNUx&rdquo; (instead
 # | of &ldquo;GNU/Linux&rdquo;)?-] {+time.  So why ask us to say
@@ -1673,21 +1693,21 @@
 "GNU/Linux&rdquo;)? <span class=\"anchor-reference-id\">(<a href="
 "\"#long1\">#long1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Omitting &ldquo;Matthew&rdquo; does not misrepresent anything important "
 "about Stallman's nature, origin, ideas or purpose.  Omitting &ldquo;"
 "GNU&rdquo; does misrepresent those things about the GNU/Linux system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is an example of a frequent way of hiding a fallacy: to bury it inside "
 "a misleading analogy.  A better analogy would be, &ldquo;Why shouldn't we "
 "call Stallman &lsquo;Torvalds&rsquo;?&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since Linux is a secondary contribution, would it be false to the facts to "
 "call the system simply &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id"
@@ -1697,7 +1717,7 @@
 "niet beter &ldquo;GNU&rdquo; kunnen noemen? <span class=\"anchor-reference-id"
 "\">(<a href=\"#justgnu\">#justgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would not be false to the facts, but it is not the best thing to do.  "
 "Here are the reasons we call that system version &ldquo;GNU/Linux&rdquo; "
@@ -1707,7 +1727,7 @@
 "redenen waarom we het &ldquo;GNU/Linux&rdquo; noemen en niet &ldquo;"
 "GNU&rdquo;:"
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It's not exactly GNU&mdash;it has a different kernel (that is, Linux).  "
 "Distinguishing GNU/Linux from GNU is useful."
@@ -1715,7 +1735,7 @@
 "Het is niet helemaal GNU&mdash;er zit een andere kernel in (te weten: "
 "Linux).  Onderscheid maken tussen GNU/Linux en GNU heeft zijn nut."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It would be ungentlemanly to ask people to <em>stop</em> giving any credit "
 "to Linus Torvalds.  He did write an important component of the system.  We "
@@ -1736,7 +1756,7 @@
 "open en eerlijk mee om, en we zullen hem dus niet uitsluiten van de "
 "erkenning die hij verdient."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
 "&ldquo;GNU&rdquo; they may simply not recognize we're talking about the same "
@@ -1747,7 +1767,7 @@
 "GNU&rdquo; zeggen zullen ze het niet herkennen. Wanneer we echter &ldquo;GNU/"
 "Linux&rdquo; gebruiken zullen ze het herkennen."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "I would have to pay a fee if I use &ldquo;Linux&rdquo; in the name of a "
 "product, and that would also apply if I say &ldquo;GNU/Linux&rdquo;.  Is it "
@@ -1761,7 +1781,7 @@
 "geld te besparen? <span class=\"anchor-reference-id\">(<a href="
 "\"#trademarkfee\">#trademarkfee</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There's nothing wrong in calling the system &ldquo;GNU&rdquo;; basically, "
 "that's what it is.  It is nice to give Linus Torvalds a share of the credit "
@@ -1771,7 +1791,7 @@
 "Het is natuurlijk prima om ook Linus Torvalds een stuk erkenning te geven "
 "maar je hoeft daarvoor niemand iets te betalen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "So if you want to refer to the system simply as &ldquo;GNU&rdquo;, to avoid "
 "paying the fee for calling it &ldquo;Linux&rdquo;, we won't criticize you."
@@ -1780,7 +1800,7 @@
 "zo een afdracht te besparen wanneer je het &ldquo;Linux&rdquo; zou noemen, "
 "ga dan vooral je gang."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today; it includes "
 "TeX, X11, Apache, Perl, and many more programs.  Don't your arguments imply "
@@ -1793,7 +1813,7 @@
 "via de naamgeving? (Wat zou leiden tot absurd lange namen) <span class="
 "\"anchor-reference-id\">(<a href=\"#many\">#many</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "What we say is that you ought to give the system's principal developer a "
 "share of the credit.  The principal developer is the GNU Project, and the "
@@ -1803,7 +1823,7 @@
 "erkenning zou moeten geven. De belangrijkste ontwikkelaar is het GNU-project "
 "en het systeem is voornamelijk GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you feel even more strongly about giving credit where it is due, you "
 "might feel that some secondary contributors also deserve credit in the "
@@ -1818,7 +1838,7 @@
 "naamgeving en je het systeem GNU/X11/Linux wilt noemen, ga dan vooral je "
 "gang. Wanneer je Perl wilt erkennen via GNU/Linux/Perl, prima."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Since a long name such as GNU/X11/Apache/Linux/TeX/Perl/Python/FreeCiv "
 "becomes absurd, at some point you will have to set a threshold and omit the "
@@ -1831,7 +1851,7 @@
 "dus bijdragen uit moeten sluiten. Waar die grens precies ligt weet niemand "
 "en dat maakt ons ook niet uit."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Different threshold levels would lead to different choices of name for the "
 "system.  But one name that cannot result from concerns of fairness and "
@@ -1844,7 +1864,7 @@
 "&ldquo;Linux&rdquo;. Het kan niet zo zijn dat de naam een kleine bijdrage "
 "erkent (Linux) en de belangrijkste bijdrage (GNU) verzwijgt."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Many companies contributed to-]{+systemd plays an important role in+}
 # | the {+GNU/Linux+} system as it is today; [-doesn't that mean-] {+are+} we
 # | [-ought-] {+obligated+} to call it [-GNU/Red&nbsp;Hat/Novell/Linux?-]
@@ -1867,7 +1887,7 @@
 "\"anchor-reference-id\">(<a href=\"#manycompanies\">#manycompanies</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "systemd is a fairly important component, but not as important as the kernel "
 "(Linux), nor as important as the basis of the system as a whole (GNU).  "
@@ -1875,7 +1895,7 @@
 "system &ldquo;GNU/systemd/Linux&rdquo;, there is nothing wrong with doing so."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today, but they don't "
 "insist on calling it XYZ/Linux.  Why should we treat GNU specially? <span "
@@ -1886,7 +1906,7 @@
 "zouden we een uitzondering maken voor GNU? <span class=\"anchor-reference-id"
 "\">(<a href=\"#others\">#others</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Thousands of projects have developed programs commonly included in today's "
 "GNU/Linux systems.  They all deserve credit for their contributions, but "
@@ -1898,7 +1918,7 @@
 "bijdrage maar ze zijn niet de belangrijkste ontwikkelaars van het systeem "
 "als geheel en dus vragen ze ook geen erkenning in die trant."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is different because it is more than just a contributed program, more "
 "than just a collection of contributed programs.  GNU is the framework on "
@@ -1908,7 +1928,7 @@
 "maar een verzameling programma's. GNU is de basis waarop het systeem is "
 "gebouwd."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "GNU is a small fraction of the system nowadays, so why should we mention it? "
 "<span class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</"
@@ -1918,7 +1938,7 @@
 "zouden we het vermelden? <span class=\"anchor-reference-id\">(<a href="
 "\"#allsmall\">#allsmall</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In 2008, we found that GNU packages made up 15% of the &ldquo;main&rdquo; "
 "repository of the gNewSense GNU/Linux distribution.  Linux made up 1.5%.  So "
@@ -1929,7 +1949,7 @@
 "gNewSense GNU/Linux distributie. Linux slechts 1,5%. Dit argument zou dus "
 "eerder moeten gelden voor de benaming &ldquo;Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is a small fraction of the system nowadays, and Linux is an even smaller "
 "fraction.  But they are the system's core; the system was made by combining "
@@ -1939,7 +1959,7 @@
 "combinatie vormt de kern van het systeem. De benaming &ldquo;GNU/"
 "Linux&rdquo; is hier dus op zijn plaats."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many companies contributed to the system as it is today; doesn't that mean "
 "we ought to call it GNU/Red&nbsp;Hat/Novell/Linux? <span class=\"anchor-"
@@ -1950,7 +1970,7 @@
 "\"anchor-reference-id\">(<a href=\"#manycompanies\">#manycompanies</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is not comparable to Red Hat or Novell; it is not a company, or an "
 "organization, or even an activity.  GNU is an operating system.  (When we "
@@ -1964,7 +1984,7 @@
 "voor het ontwikkelen van het GNU-systeem). Het GNU/Linux-systeem is "
 "gebaseerd op GNU en daarom hoort GNU onderdeel te zijn van de naam."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Much of those companies' contribution to the GNU/Linux system lies in the "
 "code they have contributed to various GNU packages including GCC and GNOME.  "
@@ -1975,7 +1995,7 @@
 "GNU-pakketten als GCC en GNOME. Het systeem GNU/Linux noemen erkent daarmee "
 "al die bedrijven en de rest van de GNU-ontwikkelaars."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
@@ -1985,7 +2005,7 @@
 "Linux&rdquo;? <span class=\"anchor-reference-id\">(<a href=\"#whyslash"
 "\">#whyslash</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean "
@@ -1997,7 +2017,7 @@
 "kan dan betekenen &ldquo;GNU's versie van Linux&rdquo; of &ldquo;Linux, wat "
 "een GNU-pakket is&rdquo;. Geen van beide combinaties is van toepassing."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is not a GNU package; that is, it wasn't developed under the GNU "
 "Project's aegis or contributed specifically to the GNU Project.  Linus "
@@ -2009,14 +2029,32 @@
 "ontwikkelde Linux onafhankelijk van GNU, als zijn eigen project. Dus de "
 "betekenis &ldquo;Linux, wat een GNU-pakket is&rdquo;, klopt niet."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | We're not talking about a distinct GNU version of Linux, the kernel.  The
+# | free GNU/Linux distros do have a <a
+# | [-href=\"http://directory.fsf.org/project/linux\";>separate-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>separate+} version
+# | of Linux</a>, since the &ldquo;standard&rdquo; version contains
+# | non[---]free firmware &ldquo;blobs&rdquo;.  If this were part of the GNU
+# | Project, it could be considered &ldquo;GNU Linux&rdquo;; but we would not
+# | want to call it that, because it would be too confusing.
+#, fuzzy
+#| msgid ""
+#| "We're not talking about a distinct GNU version of Linux, the kernel.  The "
+#| "free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/";
+#| "project/linux\">separate version of Linux</a>, since the &ldquo;"
+#| "standard&rdquo; version contains non-free firmware &ldquo;blobs&rdquo;.  "
+#| "If this were part of the GNU Project, it could be considered &ldquo;GNU "
+#| "Linux&rdquo;; but we would not want to call it that, because it would be "
+#| "too confusing."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
-"free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/project/";
-"linux\">separate version of Linux</a>, since the &ldquo;standard&rdquo; "
-"version contains non-free firmware &ldquo;blobs&rdquo;.  If this were part "
-"of the GNU Project, it could be considered &ldquo;GNU Linux&rdquo;; but we "
-"would not want to call it that, because it would be too confusing."
+"free GNU/Linux distros do have a <a href=\"https://directory.fsf.org/wiki/";
+"Linux-libre\">separate version of Linux</a>, since the &ldquo;"
+"standard&rdquo; version contains nonfree firmware &ldquo;blobs&rdquo;.  If "
+"this were part of the GNU Project, it could be considered &ldquo;GNU "
+"Linux&rdquo;; but we would not want to call it that, because it would be too "
+"confusing."
 msgstr ""
 "We hebben het niet over een bepaalde GNU-versie van  Linux, de kernel.  De "
 "vrije GNU/Linux distributies hebben wel een <a href=\"http://directory.fsf.";
@@ -2025,7 +2063,7 @@
 "Wanneer dit onderdeel zou zijn van het GNU-project zouden we het &ldquo;GNU "
 "Linux&rdquo;; kunnen noemen maar dat wordt te verwarrend."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We're talking about a version of GNU, the operating system, distinguished by "
 "having Linux as the kernel.  A slash fits the situation because it means "
@@ -2037,7 +2075,7 @@
 "&ldquo;combinatie&rdquo; aanduidt (net als bij Invoer/Uitvoer). Dit systeem "
 "is de combinatie van GNU en Linux; &ldquo;GNU/Linux&rdquo; dus."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are other ways to express &ldquo;combination&rdquo;.  If you think "
 "that a plus-sign is clearer, please use that.  In French, a hyphen is clear: "
@@ -2049,7 +2087,7 @@
 "streep toepasselijk: &ldquo;GNU-Linux&rdquo;. In het Spaans zeggen we soms: "
 "&ldquo;GNU con Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Should we say &ldquo;GNU/BSD&rdquo; too?-]{+How is the name
 # | &ldquo;GNU/Linux&rdquo; pronounced?+} <span
 # | class=\"anchor-reference-id\">(<a [-href=\"#bsd\">#bsd</a>)</span>-]
@@ -2065,14 +2103,14 @@
 "Zouden we ook &ldquo;GNU/BSD&rdquo; moeten gebruiken? <span class=\"anchor-"
 "reference-id\">(<a href=\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please pronounce it as &ldquo;GNU slash Linux.&rdquo; If you don't pronounce "
 "the slash, people will think you are saying &ldquo;GNU Linux,&rdquo; which "
 "is <a href=\"#whyslash\">not a suitable name for the combination</a>."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | Why do you write [-&ldquo;GNU/Linux&rdquo; instead of-] &ldquo;GNU
 # | [-Linux&rdquo;?-] {+Emacs&rdquo; rather than &ldquo;GNU/Emacs&rdquo;?+}
 # | <span class=\"anchor-reference-id\">(<a
@@ -2092,7 +2130,7 @@
 "Linux&rdquo;? <span class=\"anchor-reference-id\">(<a href=\"#whyslash"
 "\">#whyslash</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 # | Following the rules of English, in the construction &ldquo;GNU
 # | [-Linux&rdquo;-] {+Emacs&rdquo;+} the word &ldquo;GNU&rdquo; modifies
 # | [-&ldquo;Linux&rdquo;.  This can mean either &ldquo;GNU's version of
@@ -2116,14 +2154,14 @@
 "kan dan betekenen &ldquo;GNU's versie van Linux&rdquo; of &ldquo;Linux, wat "
 "een GNU-pakket is&rdquo;. Geen van beide combinaties is van toepassing."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;GNU/Emacs&rdquo; would mean the combination of GNU, the operating "
 "system, and the program Emacs.  That doesn't fit this program, so &ldquo;GNU/"
 "Emacs&rdquo; is the wrong way to refer to it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why &ldquo;GNU/Linux&rdquo; rather than &ldquo;Linux/GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
@@ -2131,7 +2169,7 @@
 "Waarom &ldquo;GNU/Linux&rdquo; en niet &ldquo;Linux/GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is right and proper to mention the principal contribution first.  The GNU "
 "contribution to the system is not only bigger than Linux and prior to Linux, "
@@ -2141,7 +2179,7 @@
 "bijdrage van GNU is niet alleen groter dan Linux en eerder dan Linux, we "
 "hebben het geheel opgestart."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the lowest "
 "level of the system and GNU fills technically higher levels."
@@ -2149,7 +2187,7 @@
 "Daarnaast past &ldquo;GNU/Linux&rdquo; goed bij het feit dat Linux het "
 "diepste niveau van het systeem is en GNU de technisch hogere niveaus vormt."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
 "lot better than what people usually do, which is to omit GNU entirely and "
@@ -2160,7 +2198,7 @@
 "suggestie wekken dat het hele systeem Linux is."
 
 # Nieuw
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
 "say anything about what the system consists of.  Why shouldn't they call it "
@@ -2173,7 +2211,7 @@
 "href=\"#distronames0\">#distronames0</a>)</span>"
 
 # Nieuw
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling a system &ldquo;Foobar Linux&rdquo; implies that it's a flavor of "
 "&ldquo;Linux,&rdquo; and people <a href=\"#distronames\">understand it that "
@@ -2184,7 +2222,7 @@
 "\">interpreteren het ook zo</a>."
 
 # Nieuw
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If they called a GNU/Linux distro &ldquo;Foobar BSD,&rdquo; you would call "
 "that a mistake.  &ldquo;This system is not BSD,&rdquo; you would tell them.  "
@@ -2194,7 +2232,7 @@
 "zou dat fout zijn. &ldquo;Dit systeem is niet BSD&rdquo;, zou je dan tegen "
 "hen zeggen. Maar het is ook geen Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro is called &ldquo;Foobar Linux&rdquo;; doesn't that show it's "
 "really Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
@@ -2204,7 +2242,7 @@
 "eigenlijk Linux is? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames\">#distronames</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It means that the people who make the &ldquo;Foobar Linux&rdquo; distro are "
 "repeating the common mistake. We appreciate that distributions like Debian, "
@@ -2218,7 +2256,7 @@
 "officeel onderdeel van hun naam hebben gemaakt en we hopen dat wanneer jij "
 "een andere distributie helpt, je hetzelfde zal doen."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's official name is &ldquo;Foobar Linux&rdquo;; isn't it wrong to "
 "call the distro anything but &ldquo;Foobar Linux&rdquo;? <span class="
@@ -2229,7 +2267,7 @@
 "Linux&rdquo;? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames1\">#distronames1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When they spread misinformation by changing &ldquo;GNU&rdquo; to &ldquo;"
 "Linux&rdquo;, and call their version of it &ldquo;Foobar Linux&rdquo;, it's "
@@ -2240,7 +2278,7 @@
 "en hun versie ervan &ldquo;Foobar Linux&rdquo; noemen, dan is het jouw goed "
 "recht om dit terug te veranderen in “Foobar GNU/Linux”. "
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be more effective to ask companies such as Mandrake, Red Hat and "
 "IBM to call their distributions &ldquo;GNU/Linux&rdquo; rather than asking "
@@ -2251,7 +2289,7 @@
 "vragen hun distributies &ldquo;GNU/Linux&rdquo; te noemen in plaats van "
 "individuen?"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It isn't a choice of one or the other&mdash;we ask companies and "
 "organizations and individuals to help spread the word about this.  In fact, "
@@ -2269,7 +2307,7 @@
 "we verwachten beter te verkopen wanneer we het Linux noemen&rdquo;. Oftewel, "
 "het kon het bedrijf niet schelen of het juist was of niet."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We can't make them do this right, but we're not the sort to give up just "
 "because the road isn't easy.  You may not have as much influence at your "
@@ -2283,7 +2321,7 @@
 "dat bedrijven meer winst zullen maken wanneer ze het &ldquo;GNU/Linux&rdquo; "
 "noemen."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to reserve the name &ldquo;GNU/Linux&rdquo; for "
 "distributions that are purely free software? After all, that is the ideal of "
@@ -2295,15 +2333,35 @@
 "ideaal van GNU. <span class=\"anchor-reference-id\">(<a href=\"#reserve"
 "\">#reserve</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+# | The widespread practice of adding non[---]free software to the GNU/Linux
+# | system is a major problem for our community.  It teaches the users that
+# | non[---]free software is ok, and that using it is part of the spirit of
+# | &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of
+# | their mission to help users use non[---]free add-ons, and may even invite
+# | salesmen to come and make sales pitches for them.  They adopt goals such
+# | as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them
+# | use non[---]free applications and drivers), or making the system more
+# | popular even at the cost of freedom.
+#, fuzzy
+#| msgid ""
+#| "The widespread practice of adding non-free software to the GNU/Linux "
+#| "system is a major problem for our community.  It teaches the users that "
+#| "non-free software is ok, and that using it is part of the spirit of "
+#| "&ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part "
+#| "of their mission to help users use non-free add-ons, and may even invite "
+#| "salesmen to come and make sales pitches for them.  They adopt goals such "
+#| "as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them "
+#| "use non-free applications and drivers), or making the system more popular "
+#| "even at the cost of freedom."
 msgid ""
-"The widespread practice of adding non-free software to the GNU/Linux system "
-"is a major problem for our community.  It teaches the users that non-free "
+"The widespread practice of adding nonfree software to the GNU/Linux system "
+"is a major problem for our community.  It teaches the users that nonfree "
 "software is ok, and that using it is part of the spirit of &ldquo;"
 "Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of their "
-"mission to help users use non-free add-ons, and may even invite salesmen to "
+"mission to help users use nonfree add-ons, and may even invite salesmen to "
 "come and make sales pitches for them.  They adopt goals such as &ldquo;"
-"helping the users&rdquo; of GNU/Linux (including helping them use non-free "
+"helping the users&rdquo; of GNU/Linux (including helping them use nonfree "
 "applications and drivers), or making the system more popular even at the "
 "cost of freedom."
 msgstr ""
@@ -2318,11 +2376,11 @@
 "niet-vrije toepassingen en stuurprogramma's), of het populariseren van het "
 "systeem, zelfs ten koste van de vrijheid."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The question is how to try to change this."
 msgstr "De vraag is hoe we dit kunnen veranderen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Given that most of the community which uses GNU with Linux already does not "
 "realize that's what it is, for us to disown these adulterated versions, "
@@ -2336,13 +2394,29 @@
 "gebruikers niets over vrijheid leren. De boodschap zou niet over komen. Ze "
 "zouden antwoorden dat ze niet eens wisten dat die systemen GNU waren."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The way to lead these users to see a connection with freedom is exactly
+# | the opposite: to inform them that all these system versions <em>are</em>
+# | versions of GNU, that they all are based on a system that exists
+# | specifically for the sake of the users' freedom.  With this understanding,
+# | they can start to recognize the distributions that include non[---]free
+# | software as perverted, adulterated versions of GNU, instead of thinking
+# | they are proper and appropriate &ldquo;versions of Linux&rdquo;.
+#, fuzzy
+#| msgid ""
+#| "The way to lead these users to see a connection with freedom is exactly "
+#| "the opposite: to inform them that all these system versions <em>are</em> "
+#| "versions of GNU, that they all are based on a system that exists "
+#| "specifically for the sake of the users' freedom.  With this "
+#| "understanding, they can start to recognize the distributions that include "
+#| "non-free software as perverted, adulterated versions of GNU, instead of "
+#| "thinking they are proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgid ""
 "The way to lead these users to see a connection with freedom is exactly the "
 "opposite: to inform them that all these system versions <em>are</em> "
 "versions of GNU, that they all are based on a system that exists "
 "specifically for the sake of the users' freedom.  With this understanding, "
-"they can start to recognize the distributions that include non-free software "
+"they can start to recognize the distributions that include nonfree software "
 "as perverted, adulterated versions of GNU, instead of thinking they are "
 "proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgstr ""
@@ -2355,7 +2429,7 @@
 "versies van GNU, in plaats van te denken dat het goede &ldquo;versies van "
 "Linux&rdquo; zijn."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is very useful to start GNU/Linux User Groups, which call the system GNU/"
 "Linux and adopt the ideals of the GNU Project as a basis for their "
@@ -2373,7 +2447,7 @@
 "hebben het recht om zich vast te bijten in meer oppervlakkige doelstellingen "
 "maar laat je daarin niet meesleuren!"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not make a GNU distribution of Linux (sic) and call that GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
@@ -2383,7 +2457,7 @@
 "Linux? <span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "All the &ldquo;Linux&rdquo; distributions are actually versions of the GNU "
 "system with Linux as the kernel.  The purpose of the term &ldquo;GNU/"
@@ -2396,7 +2470,7 @@
 "juist om dit over te brengen. Door een aparte distributie uit te brengen als "
 "&ldquo;GNU/Linux&rdquo; zou dit de zaak alleen maar vertroebelen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "As for developing a distribution of GNU/Linux, we already did this once, "
 "when we funded the early development of Debian GNU/Linux.  To do it again "
@@ -2410,7 +2484,7 @@
 "werk en wanneer een nieuwe distributie geen enorme praktische voordelen "
 "oplevert ten opzichte van andere distributies, mist het een doel."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Instead we help the developers of 100% free GNU/Linux distributions, such as "
 "gNewSense and Ututo."
@@ -2418,7 +2492,7 @@
 "In plaats daarvan steunen we ontwikkelaars van 100% vrije GNU/Linux "
 "distributies zoals gNewSense and Ututo."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not just say &ldquo;Linux is the GNU kernel&rdquo; and release some "
 "existing version of GNU/Linux under the name &ldquo;GNU&rdquo;? <span class="
@@ -2429,7 +2503,7 @@
 "GNU&rdquo;? <span class=\"anchor-reference-id\">(<a href=\"#linuxgnu"
 "\">#linuxgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It might have been a good idea to adopt Linux as the GNU kernel back in "
 "1992.  If we had realized, then, how long it would take to get the GNU Hurd "
@@ -2440,7 +2514,7 @@
 "om GNU Hurd aan de praat te krijgen zouden we dat wellicht hebben gedaan "
 "(helaas is dat achterafpraterij)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we were to take an existing version of GNU/Linux and relabel it as &ldquo;"
 "GNU&rdquo;, that would be somewhat like making a version of the GNU system "
@@ -2451,7 +2525,7 @@
 "&ldquo;GNU&rdquo;, zou dat net zoiets zijn als een GNU-systeem hernoemen "
 "naar &ldquo;Linux&rdquo;. Dat is niet goed en zo willen we niet opereren."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Did the GNU Project condemn and oppose use of Linux in the early days? <span "
 "class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
@@ -2459,7 +2533,7 @@
 "Was het GNU-project tegen Linux in het begin? <span class=\"anchor-reference-"
 "id\">(<a href=\"#condemn\">#condemn</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We did not adopt Linux as our kernel, but we didn't condemn or oppose it.  "
 "In 1993 we started discussing the arrangements to sponsor the development of "
@@ -2478,7 +2552,7 @@
 "hoc en niet algemeen toepasbaar; ze moesten worden geschoond voordat ze "
 "ge&iuml;nstalleerd konden worden."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who had made the changes showed little interest in cooperating "
 "with us.  One of them actually told us that he didn't care about working "
@@ -2498,7 +2572,7 @@
 "(en nog steeds praktisch de enige) groep die niet met ons samen wilden "
 "werken."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It was this experience that first showed us that people were calling a "
 "version of the GNU system &ldquo;Linux&rdquo;, and that this confusion was "
@@ -2512,7 +2586,7 @@
 "antwoord op dat probleem en andere problemen, ontstaan door de verkeerde "
 "naamgeving van &ldquo;Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why did you wait so long before asking people to use the name GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
@@ -2521,7 +2595,7 @@
 "te noemen? <span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually we didn't.  We began talking privately with developers and "
 "distributors about this in 1994, and made a more public campaign in 1996.  "
@@ -2531,7 +2605,7 @@
 "en distributeurs in 1994 en startten een meer openbare campagne in 1996. We "
 "zullen dit voortzetten, zolang als nodig."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should the GNU/<i>name</i> convention be applied to all programs that are "
 "GPL'ed? <span class=\"anchor-reference-id\">(<a href=\"#allgpled"
@@ -2541,7 +2615,7 @@
 "de GPL vallen? <span class=\"anchor-reference-id\">(<a href=\"#allgpled"
 "\">#allgpled</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We never refer to individual programs as &ldquo;GNU/<i>name</i>&rdquo;.  "
 "When a program is a GNU package, we may call it &ldquo;GNU <i>name</"
@@ -2550,7 +2624,7 @@
 "We refereren nooit aan pakketten als &ldquo;GNU/[naam]&rdquo;. Als een "
 "programma een GNU-pakket is noemen we het wel eens &ldquo;GNU [naam]&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU, the operating system, is made up of many different programs.  Some of "
 "the programs in GNU were written as part of the GNU Project or specifically "
@@ -2562,7 +2636,7 @@
 "bijgedragen; dit zijn allemaal de GNU-pakketten en we gebruiken vaak &ldquo;"
 "GNU&rdquo; in hun namen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It's up to the developers of a program to decide if they want to contribute "
 "it and make it a GNU package.  If you have developed a program and you would "
@@ -2576,7 +2650,7 @@
 "naar <a href=\"mailto:gnu@gnu.org\";>&lt;gnu@gnu.org&gt;</a>, zodat we het "
 "kunnen beoordelen en beslissen of we het willen hebben."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It wouldn't be fair to put the name GNU on every individual program that is "
 "released under the GPL.  If you write a program and release it under the "
@@ -2596,7 +2670,7 @@
 "het GNU-project ook niet met de eer gaan strijken. Er een &ldquo;GNU&rdquo;-"
 "etiket op plakken zou niet juist zijn."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In contrast, we do deserve the overall credit for the GNU operating system "
 "as a whole, even though not for each and every program in it.  The system "
@@ -2608,7 +2682,7 @@
 "gekomen, juist door onze vasthoudendheid en doorzettingsvermogen, gestart in "
 "1984, jaren voordat Linux werd gestart."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The operating system in which Linux became popular was basically the same as "
 "the GNU operating system.  It was not entirely the same, because it had a "
@@ -2620,7 +2694,7 @@
 "had maar voor de rest toch vrijwel hetzelfde. Het was een variant van GNU. "
 "Het was het GNU/Linux-systeem."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux continues to be used primarily in derivatives of that system&mdash;in "
 "today's versions of the GNU/Linux system.  What gives these systems their "
@@ -2632,7 +2706,7 @@
 "systemen definieert is GNU en Linux, die de basis hiervoor vormen, en niet "
 "alleen Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since much of GNU comes from Unix, shouldn't GNU give credit to Unix by "
 "using &ldquo;Unix&rdquo; in its name? <span class=\"anchor-reference-id\">"
@@ -2642,7 +2716,7 @@
 "van Unix is afgekeken? <span class=\"anchor-reference-id\">(<a href=\"#unix"
 "\">#unix</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Actually, none of GNU comes from Unix.  Unix was proprietary software (and "
 "still is), so using any of its code in GNU would have been illegal.  This is "
@@ -2659,7 +2733,7 @@
 "geen programma's kopi&euml;ren, of zelfs maar delen ervan, van Unix; alles "
 "moest opnieuw worden geschreven."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "No code in GNU comes from Unix, but GNU is a Unix-compatible system; "
 "therefore, many of the ideas and specifications of GNU do come from Unix.  "
@@ -2674,13 +2748,29 @@
 "wat in de hacker-gemeenschap in de jaren 70 populair was- naar Unix en "
 "bewijst het daarmee alle eer die het toekomt."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.
+# |  The author of TINT wrote another implementation of TECO (there were
+# | already many of them, for various systems), but instead of calling it by a
+# | dull name like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of
+# | a clever amusing name.  (That's what hacking means: <a
+# | href=\"http{+s+}://stallman.org/articles/on-hacking.html\">playful
+# | cleverness</a>.)
+#, fuzzy
+#| msgid ""
+#| "The first such recursive acronym was TINT, &ldquo;TINT Is Not "
+#| "TECO&rdquo;.  The author of TINT wrote another implementation of TECO "
+#| "(there were already many of them, for various systems), but instead of "
+#| "calling it by a dull name like &ldquo;<em>somethingorother</em> "
+#| "TECO&rdquo;, he thought of a clever amusing name.  (That's what hacking "
+#| "means: <a href=\"http://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
 "The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
 "The author of TINT wrote another implementation of TECO (there were already "
 "many of them, for various systems), but instead of calling it by a dull name "
 "like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of a clever "
-"amusing name.  (That's what hacking means: <a href=\"http://stallman.org/";
+"amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
 "Zo'n eerste recursieve verwijzing was TINT, &ldquo;TINT Is Niet TECO&rdquo;. "
@@ -2690,7 +2780,7 @@
 "amusante naam.  (Dat is ook wat het woord hacker betekent: <a href=\"http://";
 "stallman.org/articles/on-hacking.html\">speelse slimmigheid</a>.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Other hackers enjoyed that name so much that we imitated the approach.  It "
 "became a tradition that, when you were writing from scratch a program that "
@@ -2706,7 +2796,7 @@
 "Klever&rdquo;.  Op dezelfde manier noemden we onze vervanger voor Unix "
 "&ldquo;GNU's Niet Unix&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Historically, AT&amp;T which developed Unix did not want anyone to give it "
 "credit by using &ldquo;Unix&rdquo; in the name of a similar system, not even "
@@ -2723,7 +2813,7 @@
 "versies van Unix (allen net zo privaat als Unix) een compleet andere naam, "
 "waar geen &ldquo;Unix&rdquo; in voor komt."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we say &ldquo;GNU/BSD&rdquo; too? <span class=\"anchor-reference-id\">"
 "(<a href=\"#bsd\">#bsd</a>)</span>"
@@ -2731,7 +2821,7 @@
 "Zouden we ook &ldquo;GNU/BSD&rdquo; moeten gebruiken? <span class=\"anchor-"
 "reference-id\">(<a href=\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems, "
 "because that term does not fit the history of the BSD systems."
@@ -2739,9 +2829,19 @@
 "We noemen de BSD systemen (FreeBSD enz.) geen &ldquo;GNU/BSD&rdquo; omdat "
 "die benaming niet klopt met de historie van die systemen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The BSD system was developed by UC Berkeley as non[---]free software in
+# | the 80s, and became free in the early 90s.  A free operating system that
+# | exists today is almost certainly either a variant of the GNU system, or a
+# | kind of BSD system.
+#, fuzzy
+#| msgid ""
+#| "The BSD system was developed by UC Berkeley as non-free software in the "
+#| "80s, and became free in the early 90s.  A free operating system that "
+#| "exists today is almost certainly either a variant of the GNU system, or a "
+#| "kind of BSD system."
 msgid ""
-"The BSD system was developed by UC Berkeley as non-free software in the 80s, "
+"The BSD system was developed by UC Berkeley as nonfree software in the 80s, "
 "and became free in the early 90s.  A free operating system that exists today "
 "is almost certainly either a variant of the GNU system, or a kind of BSD "
 "system."
@@ -2751,7 +2851,7 @@
 "Een vrij besturingssysteem heden ten dage is vrijwel zeker een variant op "
 "het GNU-systeem of een BSD-systeem."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "People sometimes ask whether BSD too is a variant of GNU, as GNU/Linux is.  "
 "It is not.  The BSD developers were inspired to make their code free "
@@ -2765,7 +2865,7 @@
 "maken. Aansporingen daartoe van GNU-activisten hielp ze over de drempel maar "
 "de code heeft weinig overeenkomsten met GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "BSD systems today use some GNU packages, just as the GNU system and its "
 "variants use some BSD programs; however, taken as wholes, they are two "
@@ -2779,7 +2879,7 @@
 "ontwikkelaars schreven geen kernel die ze aan het GNU-systeem toevoegden en "
 "dus zou een naam als GNU/BSD nergens op slaan."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The connection between GNU/Linux and GNU is much closer, and that's why the "
 "name &ldquo;GNU/Linux&rdquo; is appropriate for it."
@@ -2787,7 +2887,7 @@
 "De relatie tussen GNU/Linux en GNU is veel directer en daarom is de benaming "
 "&ldquo;GNU/Linux&rdquo; veel toepasselijker."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is a version of GNU which uses the kernel from NetBSD.  Its developers "
 "call it &ldquo;Debian GNU/NetBSD&rdquo;, but &ldquo;GNU/"
@@ -2801,7 +2901,7 @@
 "systeem is, niet alleen een kernel. Het is geen BSD systeem, omdat het "
 "meeste van het systeem hetzelfde is als het GNU/Linux-systeem."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "If I install the GNU tools on Windows, does that mean I am running a GNU/"
 "Windows system? <span class=\"anchor-reference-id\">(<a href=\"#othersys"
@@ -2811,7 +2911,7 @@
 "ik een GNU/Windows systeem heb? <span class=\"anchor-reference-id\">(<a href="
 "\"#othersys\">#othersys</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
 "GNU are just a part of the GNU software, which is just a part of the GNU "
@@ -2825,7 +2925,7 @@
 "een compleet besturingssysteem die niets gemeen heeft met GNU. Alles bij "
 "elkaar is dat een compleet andere situatie als met GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can't Linux be used without GNU? <span class=\"anchor-reference-id\">(<a "
 "href=\"#justlinux\">#justlinux</a>)</span>"
@@ -2833,7 +2933,7 @@
 "Kun je Linux niet zonder GNU gebruiken? <span class=\"anchor-reference-id\">"
 "(<a href=\"#justlinux\">#justlinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is used by itself, or with small other programs, in some appliances.  "
 "These small software systems are a far cry from the GNU/Linux system.  Users "
@@ -2849,7 +2949,7 @@
 "verschillen van GNU/Linux."
 
 # Nieuw
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How much of the GNU system is needed for the system to be GNU/Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
@@ -2859,7 +2959,7 @@
 "a>)</span>"
 
 # Nieuw
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "&ldquo;How much&rdquo; is not a meaningful question because the GNU system "
 "does not have precise boundaries."
@@ -2868,7 +2968,7 @@
 "precieze grenzen kent."
 
 # Nieuw
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is an operating system maintained by a community.  It includes far more "
 "than just the GNU software packages (of which we have a specific list), and "
@@ -2886,7 +2986,7 @@
 "veel&rdquo; je gebruikt."
 
 # Nieuw
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we look at the level of packages, Linux is one important package in the "
 "GNU/Linux system.  The inclusion of one important GNU package is enough to "
@@ -2896,7 +2996,7 @@
 "het GNU/Linux-systeem. Eén belangrijk GNU-pakket in het systeem is genoeg om 
"
 "ons verzoek tot gelijkwaardige naamgeving te rechtvaardigen."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Are there complete Linux systems [sic] without GNU? <span class=\"anchor-"
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
@@ -2906,7 +3006,7 @@
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There are complete systems that contain Linux and not GNU; Android is an "
 "example.  But it is a mistake to call them &ldquo;Linux&rdquo; systems, just "
@@ -2916,7 +3016,7 @@
 "voorbeeld. Maar het is niet juist om die &ldquo;Linux&rdquo; te noemen, net "
 "zoals het niet juist is om GNU een &ldquo;Linux&rdquo;-systeem te noemen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android is very different from the GNU/Linux system&mdash;because the two "
 "have very little code in common.  In fact, the only thing they have in "
@@ -2926,7 +3026,7 @@
 "gemeenschappelijke code hebben. Het enige wat ze gemeen hebben is Linux."
 
 # Nieuw
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
 "necessary to say things like, &ldquo;Android contains Linux, but it isn't "
@@ -2939,7 +3039,7 @@
 "systeem dus]&rdquo;. "
 
 # Nieuw
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android contains just as much of Linux as GNU/Linux does.  What it doesn't "
 "have is the GNU system.  Android replaces that with Google software that "
@@ -2950,7 +3050,7 @@
 "systeem. Android vervangt dat door Google-software die erg anders werkt. Wat "
 "Android verschillend maakt van GNU/Linux is de afwezigheid van GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Is it correct to say &ldquo;using Linux&rdquo; if it refers to using GNU/"
 "Linux and using Android? <span class=\"anchor-reference-id\">(<a href="
@@ -2958,27 +3058,27 @@
 "\">#usegnulinuxandandroidlinuxsyswithoutgnu</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Far from it.  That usage is so strained that people will not understand the "
 "intended meaning."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public will find it very strange to speak of using Android as &ldquo;"
 "using Linux&rdquo;.  It's like having a conversation, then saying you were "
 "conversing with the person's intestines or the person's circulatory system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public <em>will</em> understand the idea of &ldquo;using Linux&rdquo; "
 "when it's really GNU/Linux, by way of the usual misunderstanding: thinking "
 "of the whole system as &ldquo;Linux&rdquo;."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Use of Android and use of GNU/Linux are totally different, as different as "
 "driving a car and riding a bicycle.  The fact that the first two both "
@@ -2991,7 +3091,7 @@
 "GNU/Linux and Android.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not call the system &ldquo;Linux&rdquo; anyway, and strengthen Linus "
 "Torvalds' role as posterboy for our community? <span class=\"anchor-"
@@ -3001,7 +3101,7 @@
 "Linus Torvalds het &ldquo;gezicht&rdquo; van onze gemeenschap zijn? <span "
 "class=\"anchor-reference-id\">(<a href=\"#helplinus\">#helplinus</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Linus Torvalds is the &ldquo;posterboy&rdquo; (other people's choice of "
 "word, not ours) for his goals, not ours.  His goal is to make the system "
@@ -3019,12 +3119,30 @@
 "free.html\">de vrijheid om samen te werken</a> als hoger doel en dus "
 "associeert men Linux niet met dit doel."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | Linus publicly states his disagreement with the free software movement's
+# | ideals.  He developed non[---]free software in his job for many years (and
+# | said so to a large audience at a &ldquo;Linux&rdquo;World show), and
+# | publicly invited fellow developers of Linux, the kernel, to use
+# | non[---]free software to work on it with him.  He goes even further, and
+# | rebukes people who suggest that engineers and scientists should consider
+# | social consequences of our technical work&mdash;rejecting the lessons
+# | society learned from the development of the atom bomb.
+#, fuzzy
+#| msgid ""
+#| "Linus publicly states his disagreement with the free software movement's "
+#| "ideals.  He developed non-free software in his job for many years (and "
+#| "said so to a large audience at a &ldquo;Linux&rdquo;World show), and "
+#| "publicly invited fellow developers of Linux, the kernel, to use non-free "
+#| "software to work on it with him.  He goes even further, and rebukes "
+#| "people who suggest that engineers and scientists should consider social "
+#| "consequences of our technical work&mdash;rejecting the lessons society "
+#| "learned from the development of the atom bomb."
 msgid ""
 "Linus publicly states his disagreement with the free software movement's "
-"ideals.  He developed non-free software in his job for many years (and said "
+"ideals.  He developed nonfree software in his job for many years (and said "
 "so to a large audience at a &ldquo;Linux&rdquo;World show), and publicly "
-"invited fellow developers of Linux, the kernel, to use non-free software to "
+"invited fellow developers of Linux, the kernel, to use nonfree software to "
 "work on it with him.  He goes even further, and rebukes people who suggest "
 "that engineers and scientists should consider social consequences of our "
 "technical work&mdash;rejecting the lessons society learned from the "
@@ -3039,7 +3157,7 @@
 "ingenieurs en wetenschappers ook sociale gevolgen heeft&mdash;de geleerde "
 "lessen bij de ontwikkeling van de atoombom daarmee negerend."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with writing a free program for the motivations of "
 "learning and having fun; the kernel Linus wrote for those reasons was an "
@@ -3059,7 +3177,7 @@
 "realiseren dat dit besturingssysteem uit die vrijheids-idealen voort komen, "
 "niet uit zijn overtuiging."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong for us to label Linus Torvalds' work as GNU? <span class="
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
@@ -3068,7 +3186,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong, so we don't do that.  Torvalds' work is Linux, the "
 "kernel; we are careful not to attribute that work to the GNU Project or "
@@ -3080,7 +3198,7 @@
 "&ldquo;GNU&rdquo; te bestempelen. Wanneer we het over het geheel hebben "
 "noemen we het &ldquo;GNU/Linux&rdquo;, ere wie ere toekomt."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Does Linus Torvalds agree that Linux is just the kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
@@ -3088,10 +3206,23 @@
 "Is Linus Torvalds het er mee eens dat Linux alleen de kernel is? <span class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | He recognized this at the beginning.  The earliest Linux release notes
+# | said, <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | &ldquo;Most of the tools used with linux are GNU software and are under
+# | the GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
+# |  for more info&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
+#| "versions/RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are "
+#| "GNU software and are under the GNU copyleft. These tools aren't in the "
+#| "distribution - ask me (or GNU)  for more info&rdquo;</a>."
 msgid ""
 "He recognized this at the beginning.  The earliest Linux release notes said, "
-"<a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"<a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
 "RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are GNU software "
 "and are under the GNU copyleft. These tools aren't in the distribution - ask "
 "me (or GNU)  for more info&rdquo;</a>."
@@ -3104,7 +3235,7 @@
 "a>."
 
 # Nieuw
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not finish the GNU Hurd kernel, release the GNU system as a whole, and "
 "forget the question of what to call GNU/Linux? <span class=\"anchor-"
@@ -3116,7 +3247,7 @@
 "span>"
 
 # Nieuw
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We would like credit for the GNU operating system no matter which kernel is "
 "used with it."
@@ -3125,13 +3256,27 @@
 "welke kernel dan ook erbij gebruikt wordt."
 
 # Nieuw
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | Making the GNU Hurd work well enough to compete with Linux would be a big
+# | job, and it's not clearly necessary.  The only thing ethically wrong with
+# | Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the
+# | best fix for that problem is <a
+# | [-href=\"http://fsf.org/campaigns/priority-projects\";>-]
+# | {+href=\"https://www.fsf.org/campaigns/priority-projects\";>+} developing
+# | free replacement for the blobs</a>.
+#, fuzzy
+#| msgid ""
+#| "Making the GNU Hurd work well enough to compete with Linux would be a big "
+#| "job, and it's not clearly necessary.  The only thing ethically wrong with "
+#| "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the "
+#| "best fix for that problem is <a href=\"http://fsf.org/campaigns/priority-";
+#| "projects\"> developing free replacement for the blobs</a>."
 msgid ""
 "Making the GNU Hurd work well enough to compete with Linux would be a big "
 "job, and it's not clearly necessary.  The only thing ethically wrong with "
 "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the best "
-"fix for that problem is <a href=\"http://fsf.org/campaigns/priority-projects";
-"\"> developing free replacement for the blobs</a>."
+"fix for that problem is <a href=\"https://www.fsf.org/campaigns/priority-";
+"projects\"> developing free replacement for the blobs</a>."
 msgstr ""
 "Om GNU Hurd net zo goed te maken als Linux zou een zware taak zijn en is "
 "niet echt nodig. Het enige ethisch verkeerde aan de kernel Linux is dat het "
@@ -3139,7 +3284,7 @@
 "href=\"http://fsf.org/campaigns/priority-projects\";> ontwikkelen van vrije "
 "vervangingen voor deze blobs</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The battle is already lost&mdash;society has made its decision and we can't "
 "change it, so why even think about it? <span class=\"anchor-reference-id\">"
@@ -3150,7 +3295,7 @@
 "\"anchor-reference-id\">(<a href=\"#lost\">#lost</a>)</span>"
 
 # bewustwordingscampagne
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This isn't a battle, it is a campaign of education.  What to call the system "
 "is not a single decision, to be made at one moment by &ldquo;society&rdquo;: "
@@ -3167,7 +3312,7 @@
 "beslissen het zo te noemen&mdash;en door dat te doen geef je het goede "
 "voorbeeld."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Society has made its decision and we can't change it, so what good does it "
 "do if I say &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id\">(<a "
@@ -3178,7 +3323,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#whatgood\">#whatgood</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is not an all-or-nothing situation: correct and incorrect pictures are "
 "being spread more or less by various people.  If you call the system &ldquo;"
@@ -3198,7 +3343,7 @@
 "een behoorlijk aantal mensen daarmee helpen zonder veel inspanning. En "
 "sommigen zullen dit op hun beurt weer doen."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to call the system &ldquo;Linux&rdquo; and teach "
 "people its real origin with a ten-minute explanation? <span class=\"anchor-"
@@ -3208,7 +3353,7 @@
 "vergezeld van een verklaring van enkele minuten? <span class=\"anchor-"
 "reference-id\">(<a href=\"#explain\">#explain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "If you help us by explaining to others in that way, we appreciate your "
 "effort, but that is not the best method.  It is not as effective as calling "
@@ -3219,7 +3364,7 @@
 "lang niet zo effectief als het systeem gewoon &ldquo;GNU/Linux&rdquo; te "
 "noemen en ook minder economisch."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is ineffective because it may not sink in, and surely will not "
 "propagate.  Some of the people who hear your explanation will pay attention, "
@@ -3235,7 +3380,7 @@
 "Linux&rdquo; noemen.  Zonder die bedoeling te hebben zullen ze de misvatting "
 "hiermee juist verspreiden."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is inefficient because it takes a lot more time.  Saying and writing "
 "&ldquo;GNU/Linux&rdquo; will take you only a few seconds a day, not minutes, "
@@ -3249,7 +3394,7 @@
 "termen Linux en GNU/Linux is verreweg de meest effectieve manier om het GNU-"
 "project te helpen."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people laugh at you when you ask them to call the system GNU/Linux.  "
 "Why do you subject yourself to this treatment? <span class=\"anchor-"
@@ -3259,7 +3404,7 @@
 "noemen. Waarom laat je dit gebeuren? <span class=\"anchor-reference-id\">(<a "
 "href=\"#treatment\">#treatment</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; tends to give people a mistaken "
 "picture of the system's history and reason for existence.  People who laugh "
@@ -3274,7 +3419,7 @@
 "ze vragen ons daarin te erkennen. Wanneer ze de waarheid hadden gekend "
 "hadden ze waarschijnlijk niet gelachen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Why do we take the risk of making a request that sometimes leads people to "
 "ridicule us? Because often it has useful results that help the GNU Project.  "
@@ -3284,7 +3429,7 @@
 "voordeel oplevert voor het GNU-project. Dat risico zijn we wel bereid te "
 "lopen wanneer we daarmee ons doel bereiken."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you see such an ironically unfair situation occurring, please don't sit "
 "idly by.  Please teach the laughing people the real history.  When they see "
@@ -3295,7 +3440,7 @@
 "Wanneer mensen begrijpen dat het een gerechtvaardigd verzoek is zullen ze "
 "niet meer lachen."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people condemn you when you ask them to call the system GNU/Linux.  "
 "Don't you lose by alienating them? <span class=\"anchor-reference-id\">(<a "
@@ -3305,7 +3450,7 @@
 "noemen. Verlies je dan niet doordat je die mensen van je vervreemd? <span "
 "class=\"anchor-reference-id\">(<a href=\"#alienate\">#alienate</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not much.  People who don't appreciate our role in developing the system are "
 "unlikely to make substantial efforts to help us.  If they do work that "
@@ -3320,7 +3465,7 @@
 "hoogstwaarschijnlijk gebeuren om andere redenen. Niet omdat wij het van ze "
 "vragen."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It makes no sense to worry about alienating people who are already mostly "
 "uncooperative, and it is self-defeating to be deterred from correcting a "
@@ -3332,7 +3477,7 @@
 "je doel voorbij. En dus zullen we blijven proberen deze misvatting recht te "
 "zetten."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Whatever you contributed, is it legitimate to rename the operating system? "
 "<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
@@ -3341,7 +3486,7 @@
 "naam te veranderen? <span class=\"anchor-reference-id\">(<a href=\"#rename"
 "\">#rename</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are not renaming anything; we have been calling this system &ldquo;"
 "GNU&rdquo; ever since we announced it in 1983.  The people who tried to "
@@ -3351,7 +3496,7 @@
 "sinds de eerste aankondiging in 1983. Degenen die het probeerden om te dopen "
 "tot &ldquo;Linux&rdquo; hadden dit niet moeten doen."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong to force people to call the system &ldquo;GNU/Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
@@ -3360,7 +3505,7 @@
 "Linux&rdquo; te noemen? <span class=\"anchor-reference-id\">(<a href=\"#force"
 "\">#force</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong to force them, and we don't try.  We call the system "
 "&ldquo;GNU/Linux&rdquo;, and we ask you to do it too."
@@ -3368,7 +3513,7 @@
 "Het zou fout zijn ze te dwingen dus dat proberen we ook niet. We noemen het "
 "systeem &ldquo;GNU/Linux&rdquo; en vragen anderen dat ook te doen."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not sue people who call the whole system &ldquo;Linux&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
@@ -3377,7 +3522,7 @@
 "Linux&rdquo; noemen? <span class=\"anchor-reference-id\">(<a href="
 "\"#whynotsue\">#whynotsue</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are no legal grounds to sue them, but since we believe in freedom of "
 "speech, we wouldn't want to do that anyway.  We ask people to call the "
@@ -3387,7 +3532,7 @@
 "meningsuiting zouden we dit ook niet willen. We vragen mensen het systeem "
 "&ldquo;GNU/Linux&rdquo; te noemen omdat dit de juiste naam is."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Shouldn't you put something in the GNU GPL to require people to call the "
 "system &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id\">(<a href="
@@ -3397,13 +3542,31 @@
 "GNU&rdquo; te noemen? <span class=\"anchor-reference-id\">(<a href=\"#require"
 "\">#require</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
+# | The purpose of the GNU GPL is to protect the users' freedom from those who
+# | would make proprietary versions of free software.  While it is true that
+# | those who call the system &ldquo;Linux&rdquo; often do things that limit
+# | the users' freedom, such as bundling non[---]free software with the
+# | GNU/Linux system or even developing non[---]free software for such use,
+# | the mere act of calling the system &ldquo;Linux&rdquo; does not, in
+# | itself, deny users their freedom.  It seems improper to make the GPL
+# | restrict what name people can use for the system.
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU GPL is to protect the users' freedom from those "
+#| "who would make proprietary versions of free software.  While it is true "
+#| "that those who call the system &ldquo;Linux&rdquo; often do things that "
+#| "limit the users' freedom, such as bundling non-free software with the GNU/"
+#| "Linux system or even developing non-free software for such use, the mere "
+#| "act of calling the system &ldquo;Linux&rdquo; does not, in itself, deny "
+#| "users their freedom.  It seems improper to make the GPL restrict what "
+#| "name people can use for the system."
 msgid ""
 "The purpose of the GNU GPL is to protect the users' freedom from those who "
 "would make proprietary versions of free software.  While it is true that "
 "those who call the system &ldquo;Linux&rdquo; often do things that limit the "
-"users' freedom, such as bundling non-free software with the GNU/Linux system "
-"or even developing non-free software for such use, the mere act of calling "
+"users' freedom, such as bundling nonfree software with the GNU/Linux system "
+"or even developing nonfree software for such use, the mere act of calling "
 "the system &ldquo;Linux&rdquo; does not, in itself, deny users their "
 "freedom.  It seems improper to make the GPL restrict what name people can "
 "use for the system."
@@ -3416,7 +3579,7 @@
 "vrijheid van gebruikers. Het lijkt daarom niet gepast de GPL hiervoor te "
 "gebruiken."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you objected to the original BSD license's advertising requirement to "
 "give credit to the University of California, isn't it hypocritical to demand "
@@ -3428,7 +3591,7 @@
 "ditzelfde te eisen voor het GNU-project? <span class=\"anchor-reference-id\">"
 "(<a href=\"#BSDlicense\">#BSDlicense</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would be hypocritical to make the name GNU/Linux a license requirement, "
 "and we don't.  We only <em>ask</em> you to give us the credit we deserve."
@@ -3438,7 +3601,7 @@
 "die ons toekomt."
 
 # Nieuw
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please note that there are at least <a href=\"/licenses/bsd.html\"> two "
 "different BSD licenses</a>.  For clarity's sake, please don't use the term "
@@ -3449,7 +3612,7 @@
 "niet de term &ldquo;BSD-licentie&rdquo; zonder daarbij aan te geven om welke "
 "het gaat."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you failed to put something in the GNU GPL to require people to call "
 "the system &ldquo;GNU&rdquo;, you deserve what happened; why are you "
@@ -3460,7 +3623,7 @@
 "zelf over je afgeroepen; wat zeur je nog? <span class=\"anchor-reference-id"
 "\">(<a href=\"#deserve\">#deserve</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The question presupposes a rather controversial general ethical premise: "
 "that if people do not force you to treat them fairly, you are entitled to "
@@ -3471,11 +3634,11 @@
 "niet dwingt je eerlijk te behandelen ze het recht hebben misbruik van je te "
 "maken."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope you disagree with that premise just as we do."
 msgstr "We hopen dat je dit uitgangspunt, net als ons, verwerpt."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't you be better off not contradicting what so many people believe? "
 "<span class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)"
@@ -3485,7 +3648,7 @@
 "gaan? <span class=\"anchor-reference-id\">(<a href=\"#contradict"
 "\">#contradict</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't think we should go along with large numbers of people because they "
 "have been misled.  We hope you too will decide that truth is important."
@@ -3493,7 +3656,7 @@
 "We geloven niet dat we hierin mee moeten gaan met de misleidde massa. We "
 "hopen dat jij de waarheid ook belangrijk vindt."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We could never have developed a free operating system without first denying "
 "the belief, held by most people, that proprietary software was legitimate "
@@ -3503,7 +3666,7 @@
 "de heersende opvatting, dat private software legitiem en acceptabel zou "
 "zijn, niet hadden getrotseerd."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
 "<span class=\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</"
@@ -3513,13 +3676,13 @@
 "meer uit? <span class=\"anchor-reference-id\">(<a href=\"#somanyright"
 "\">#somanyright</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "We don't think that the popularity of an error makes it the truth."
 msgstr ""
 "We geloven niet dat de populariteit van een fout dit tot waarheid verheft."
 
 # Nieuw
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it better to call the system by the name most users already know? "
 "<span class=\"anchor-reference-id\">(<a href=\"#knownname\">#knownname</a>)</"
@@ -3530,7 +3693,7 @@
 "\"#knownname\">#knownname</a>)</span>"
 
 # Nieuw
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo; includes "
 "&ldquo;Linux&rdquo;, they will recognize what you're talking about.  If you "
@@ -3542,7 +3705,7 @@
 "toe &ldquo;(waar vaak foutief naar wordt verwezen met &lsquo;Linux&rsquo;)"
 "&rdquo; toevoegt, zal iedereen het begrijpen."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many people care about what's convenient or who's winning, not about "
 "arguments of right or wrong.  Couldn't you get more of their support by a "
@@ -3554,19 +3717,31 @@
 "verwerven? <span class=\"anchor-reference-id\">(<a href=\"#winning"
 "\">#winning</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+# | To care only about what's convenient or who's winning is an amoral
+# | approach to life.  Non[---]free software is an example of that amoral
+# | approach and thrives on it.  Thus, in the long run it would be
+# | self-defeating for us to adopt that approach.  We will continue talking in
+# | terms of right and wrong.
+#, fuzzy
+#| msgid ""
+#| "To care only about what's convenient or who's winning is an amoral "
+#| "approach to life.  Non-free software is an example of that amoral "
+#| "approach and thrives on it.  Thus, in the long run it would be self-"
+#| "defeating for us to adopt that approach.  We will continue talking in "
+#| "terms of right and wrong."
 msgid ""
 "To care only about what's convenient or who's winning is an amoral approach "
-"to life.  Non-free software is an example of that amoral approach and "
-"thrives on it.  Thus, in the long run it would be self-defeating for us to "
-"adopt that approach.  We will continue talking in terms of right and wrong."
+"to life.  Nonfree software is an example of that amoral approach and thrives "
+"on it.  Thus, in the long run it would be self-defeating for us to adopt "
+"that approach.  We will continue talking in terms of right and wrong."
 msgstr ""
 "Alleen geven om gemak of winnaars is een amorele benadering van het leven.  "
 "Niet-vrije software is hiervan een voorbeeld en gedijt daarop. Dus op de "
 "langere termijn snijden we onszelf in de vingers met een dergelijke "
 "benadering. We zullen doorgaan op basis van wat goed en fout is."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope that you are one of those for whom right and wrong do matter."
 msgstr "We hopen dat jij ook om goed en fout geeft."
 
@@ -3619,19 +3794,15 @@
 "voor informatie over het onderhoud van vertalingen op deze website."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2001, [-2006, 2007, 2008,-] {+2006-2008,+} 2010, 2011,
-# | 2013, [-2014, 2015, 2016, 2017-] {+2014-2018, 2020, 2021+} Free Software
-# | Foundation, Inc.
+# | Copyright &copy; [-2014, 2015, 2016, 2017-] {+2001-2011, 2013-2018, 2020,
+# | 2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
-#| "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, "
-#| "2016, 2017 Free Software Foundation, Inc."
+#| "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, 2016, "
-"2017 Free Software Foundation, Inc."
+"Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation, "
+"Inc."
+msgstr "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -3655,6 +3826,17 @@
 msgid "Updated:"
 msgstr "Bijgewerkt:"
 
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, "
+#~| "2016, 2017 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
+#~ "Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, "
+#~ "2016, 2017 Free Software Foundation, Inc."
+
 #~ msgid "GNU/Linux FAQ by Richard Stallman"
 #~ msgstr "GNU/Linux veelgestelde vragen door Richard Stallman"
 

Index: gnu/po/gnu-linux-faq.pl-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.pl-diff.html,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- gnu/po/gnu-linux-faq.pl-diff.html   7 Apr 2021 18:03:55 -0000       1.24
+++ gnu/po/gnu-linux-faq.pl-diff.html   30 Aug 2021 13:34:53 -0000      1.25
@@ -10,35 +10,34 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;GNU/Linux FAQ
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/gnu/po/gnu-linux-faq.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;GNU/Linux FAQ 
by</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;GNU/Linux FAQ&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;GNU/Linux <span class="removed"><del><strong>FAQ 
by</strong></del></span> <span class="inserted"><ins><em>FAQ&lt;/h2&gt;
 
-&lt;address class="byline c"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;</strong></del></span> <span 
class="inserted"><ins><em>Stallman&lt;/address&gt;
+&lt;address class="byline"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;
 
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;To</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;To</em></ins></span> learn more about 
this issue, you can also read
+  &lt;blockquote&gt;&lt;p&gt;To learn more about this issue, you can also read
 our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
Project&lt;/a&gt;, our
  page on &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;
 and our page on &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU
-Users Who Have Never Heard of <span 
class="removed"><del><strong>GNU&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;</strong></del></span>
 <span class="inserted"><ins><em>GNU&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
-&lt;/div&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;
+Users Who Have Never Heard of GNU&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span> <span 
class="inserted"><ins><em>Stallman&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;
 When people see that we use and recommend the name GNU/Linux for a
 system that many others call just &ldquo;Linux&rdquo;, they ask many questions.
 Here are common questions, and our answers.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;div class="toc"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;h3 class="no-display"&gt;Table of Contents&lt;/h3&gt;</em></ins></span>
 &lt;ul&gt;
 
 &lt;li&gt;&lt;a <span class="removed"><del><strong>href="#why" 
id="TOCwhy"&gt;Why</strong></del></span> <span 
class="inserted"><ins><em>href="#why"&gt;Why</em></ins></span> do you call 
<span class="removed"><del><strong>it</strong></del></span> <span 
class="inserted"><ins><em>the system we use</em></ins></span> GNU/Linux and not 
Linux?&lt;/a&gt;&lt;/li&gt;
@@ -299,7 +298,16 @@
     get more of their support by a different road?&lt;/a&gt;&lt;/li&gt;
 
 &lt;/ul&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;/div&gt;
+
+&lt;div class="announcement comment" role="complementary"&gt;
+&lt;p&gt;To learn more about this issue, you can also read
+our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
System&lt;/a&gt;, our
+ page on &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;
+and our page on &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU
+Users Who Have Never Heard of GNU&lt;/a&gt;.&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;</em></ins></span>
 
 &lt;dl&gt;
 
@@ -340,10 +348,13 @@
 
 &lt;dt <span class="inserted"><ins><em>id="what"&gt;What is the real 
relationship between GNU and Linux? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#what"&gt;#what&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
-&lt;dd&gt;The GNU operating system and the Linux kernel are separate
+&lt;dd&gt;
+&lt;p&gt;
+The GNU operating system and the Linux kernel are separate
 software projects that do complementary jobs.  Typically they are
 packaged in a &lt;a href="/distros/distros.html"&gt;GNU/Linux 
distribution&lt;/a&gt;, and used
-together.&lt;/dd&gt;
+together.&lt;/p&gt;
+&lt;/dd&gt;
 
 &lt;dt</em></ins></span> id="howerror"&gt;How did it come about that most
     people call the system &ldquo;Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#howerror"&gt;#howerror&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
@@ -456,11 +467,12 @@
           support an individual's free speech rights to call the system by
           any name that individual chooses? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#freespeech"&gt;#freespeech&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Yes, indeed, we believe you have a free speech right to call the
 operating system by any name you wish.  We ask that people call it
 GNU/Linux as a matter of doing justice to the GNU project, to promote
 the values of freedom that GNU stands for, and to inform others that
-those values of freedom brought the system into existence.
+those values of freedom brought the system into <span 
class="removed"><del><strong>existence.</strong></del></span> <span 
class="inserted"><ins><em>existence.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="everyoneknows"&gt;Since everyone knows
@@ -491,11 +503,12 @@
     why does it matter what name I use? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#everyoneknows2"&gt;#everyoneknows2&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 If your words don't reflect your knowledge, you don't teach others.
 Most people who have heard of the GNU/Linux system think it is
 &ldquo;Linux&rdquo;, that it was started by Linus Torvalds, and that
 it was intended to be &ldquo;open source&rdquo;.  If you don't tell
-them, who will?
+them, who <span class="removed"><del><strong>will?</strong></del></span> <span 
class="inserted"><ins><em>will?&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="windows"&gt;Isn't shortening &ldquo;GNU/Linux&rdquo;
@@ -602,19 +615,21 @@
 &lt;dt id="brain"&gt;Isn't the kernel the brain of the system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#brain"&gt;#brain&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 A computer system is not much like a human body,
 and no part of it plays a role comparable to that of
-the brain in a human.
+the brain in a <span class="removed"><del><strong>human.</strong></del></span> 
<span class="inserted"><ins><em>human.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="kernelmost"&gt;Isn't writing the kernel most of the work in an
 operating system? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#kernelmost"&gt;#kernelmost&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-No, many components take a lot of work.
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
+No, many components take a lot of <span 
class="removed"><del><strong>work.</strong></del></span> <span 
class="inserted"><ins><em>work.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="nokernel"&gt;An operating system 
requires a kernel.
+&lt;dt id="nokernel"&gt;An operating system requires a kernel.
     Since the GNU Project didn't develop a kernel, how can
     the system be GNU?&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#nokernel"&gt;#nokernel&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -633,10 +648,10 @@
 &lt;p&gt;
 Linus Torvalds made an important contribution to the operating system
 we use; the GNU Project started earlier and contributed much more.
-The name &ldquo;GNU/Linux&rdquo; gives credit to each.&lt;/p&gt;
+The name &ldquo;GNU/Linux&rdquo; gives credit to 
each.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="notinstallable"&gt;How can GNU be an
+&lt;dt id="notinstallable"&gt;How can GNU be an
     operating system, if I can't get something called &ldquo;GNU&rdquo;
     and install it? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#notinstallable"&gt;#notinstallable&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -697,11 +712,12 @@
     feel of Linux&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#feel"&gt;#feel&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 There is no such thing as the &ldquo;feel of Linux&rdquo; because
 Linux has no user interfaces.  Like any modern kernel, Linux is a base
 for running programs; user interfaces belong elsewhere in the system.
 Human interaction with GNU/Linux always goes through other programs,
-and the &ldquo;feel&rdquo; comes from them.
+and the &ldquo;feel&rdquo; comes from <span 
class="removed"><del><strong>them.</strong></del></span> <span 
class="inserted"><ins><em>them.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="long"&gt;The problem with &ldquo;GNU/Linux&rdquo; is that it is too 
long.
@@ -717,7 +733,7 @@
 given below&lt;/a&gt;.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="removed"><del><strong>id="long2"&gt;The problem with 
&ldquo;GNU/Linux&rdquo; is</strong></del></span> <span 
class="inserted"><ins><em>id="long1"&gt;How about calling the system
+&lt;dt <span class="inserted"><ins><em>id="long1"&gt;How about calling the 
system
     &ldquo;GliNUx&rdquo; (instead of &ldquo;GNU/Linux&rdquo;)?
    &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#long1"&gt;#long1&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -732,7 +748,7 @@
 not read it.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt id="long2"&gt;The problem with &ldquo;GNU/Linux&rdquo; 
is</em></ins></span> that it is too long.
+&lt;dt</em></ins></span> id="long2"&gt;The problem with 
&ldquo;GNU/Linux&rdquo; is that it is too long.
     Why should I go to the trouble of saying &ldquo;GNU/&rdquo;?
     &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#long2"&gt;#long2&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -792,7 +808,8 @@
 may simply not recognize we're talking about the same system.  If we
 say &ldquo;GNU/Linux&rdquo;, they can make a connection to what they have heard
 about.&lt;/li&gt;
-&lt;/ul&gt;&lt;p&gt;&lt;/p&gt;
+<span 
class="removed"><del><strong>&lt;/ul&gt;&lt;p&gt;&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/ul&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="trademarkfee"&gt;I would have
@@ -846,11 +863,12 @@
     GNU/systemd/Linux? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#others"&gt;#others&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+&lt;p&gt;
 systemd is a fairly important component, but not as important as the
 kernel (Linux), nor as important as the basis of the system as a whole
 (GNU).  However, if you want to emphasize the presence of systemd
 by calling the system &ldquo;GNU/systemd/Linux&rdquo;, there is nothing
-wrong with doing so.
+wrong with doing so.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt</em></ins></span> id="others"&gt;Many other projects contributed to
@@ -922,8 +940,8 @@
 &lt;p&gt;
 We're not talking about a distinct GNU version of Linux, the kernel.
 The free GNU/Linux distros do have
-a &lt;a href="http://directory.fsf.org/project/linux"&gt;separate version of
-Linux&lt;/a&gt;, since the &ldquo;standard&rdquo; version contains non-free
+a &lt;a <span 
class="removed"><del><strong>href="http://directory.fsf.org/project/linux"&gt;separate</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://directory.fsf.org/wiki/Linux-libre"&gt;separate</em></ins></span>
 version of
+Linux&lt;/a&gt;, since the &ldquo;standard&rdquo; version contains <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
 firmware &ldquo;blobs&rdquo;.  If this were part of the GNU Project,
 it could be considered &ldquo;GNU Linux&rdquo;; but we would not want
 to call it that, because it would be too confusing.&lt;/p&gt;
@@ -1047,13 +1065,13 @@
     free software?  After all, that is the ideal of GNU. &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#reserve"&gt;#reserve&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-The widespread practice of adding non-free software to the GNU/Linux
+The widespread practice of adding <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software to the GNU/Linux
 system is a major problem for our community.  It teaches the users
-that non-free software is ok, and that using it is part of the spirit
+that <span class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software is ok, and that 
using it is part of the spirit
 of &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of 
their mission to
-help users use non-free add-ons, and may even invite salesmen to come
+help users use <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> add-ons, and may even 
invite salesmen to come
 and make sales pitches for them.  They adopt goals such as &ldquo;helping
-the users&rdquo; of GNU/Linux (including helping them use non-free
+the users&rdquo; of GNU/Linux (including helping them use <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
 applications and drivers), or making the system more popular even at
 the cost of freedom.
 &lt;p&gt;
@@ -1071,7 +1089,7 @@
 versions &lt;em&gt;are&lt;/em&gt; versions of GNU, that they all are based on a
 system that exists specifically for the sake of the users' freedom.
 With this understanding, they can start to recognize the distributions
-that include non-free software as perverted, adulterated versions of
+that include <span class="removed"><del><strong>non-free</strong></del></span> 
<span class="inserted"><ins><em>nonfree</em></ins></span> software as 
perverted, adulterated versions of
 GNU, instead of thinking they are proper and appropriate &ldquo;versions of
 Linux&rdquo;.&lt;/p&gt;
 &lt;p&gt;
@@ -1224,7 +1242,7 @@
 (there were already many of them, for various systems), but instead of
 calling it by a dull name like &ldquo;&lt;em&gt;somethingorother&lt;/em&gt; 
TECO&rdquo;, he
 thought of a clever amusing name.  (That's what hacking
-means: &lt;a href="http://stallman.org/articles/on-hacking.html"&gt;playful
+means: &lt;a <span 
class="removed"><del><strong>href="http://stallman.org/articles/on-hacking.html"&gt;playful</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://stallman.org/articles/on-hacking.html"&gt;playful</em></ins></span>
 cleverness&lt;/a&gt;.)&lt;/p&gt;
 &lt;p&gt;
 Other hackers enjoyed that name so much that we imitated the approach.
@@ -1250,7 +1268,7 @@
 We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems,
 because that term does not fit the history of the BSD systems.
 &lt;p&gt;
-The BSD system was developed by UC Berkeley as non-free software in
+The BSD system was developed by UC Berkeley as <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software in
 the 80s, and became free in the early 90s.  A free operating system
 that exists today is almost certainly either a variant of the GNU
 system, or a kind of BSD system.&lt;/p&gt;
@@ -1281,25 +1299,27 @@
 on Windows, does that mean I am running a GNU/Windows system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#othersys"&gt;#othersys&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of 
GNU
 are just a part of the GNU software, which is just a part of the GNU
 system, and underneath them you would still have another complete
 operating system which has no code in common with GNU.  All in all,
-that's a very different situation from GNU/Linux.
+that's a very different situation from <span 
class="removed"><del><strong>GNU/Linux.</strong></del></span> <span 
class="inserted"><ins><em>GNU/Linux.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="justlinux"&gt;Can't Linux be used without GNU? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#justlinux"&gt;#justlinux&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Linux is used by itself, or with small other programs, in some
 appliances.  These small software systems are a far cry from the
 GNU/Linux system.  Users do not install them on PCs, for instance, and
 would find them rather disappointing.  It is useful to say that these
 appliances run just Linux, to show how different those small platforms
-are from GNU/Linux.
+are from <span class="inserted"><ins><em>GNU/Linux.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="howmuch"&gt;How much of the GNU 
system is needed for the system
+&lt;dt id="howmuch"&gt;How much of the GNU system is needed for the system
 to be
 GNU/Linux? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#howmuch"&gt;#howmuch&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -1310,17 +1330,17 @@
 GNU is an operating system maintained by a community.  It includes far
 more than just the GNU software packages (of which we have a specific
 list), and people add more packages constantly.  Despite these
-changes, it remains the GNU system, and adding Linux to that yields
-GNU/Linux.  If you use part of the GNU system and omit part, there is
+changes, it remains the GNU system, and adding Linux to that 
yields</em></ins></span>
+GNU/Linux.  <span class="inserted"><ins><em>If you use part of the GNU system 
and omit part, there is
 no meaningful way to say &ldquo;how much&rdquo; you used.&lt;/p&gt;
 &lt;p&gt;
 If we look at the level of packages, Linux is one important package in
 the GNU/Linux system.  The inclusion of one important GNU package is
 enough to justify our request for equal mention.
-&lt;/p&gt;
+&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="linuxsyswithoutgnu"&gt;Are there complete Linux 
systems [sic] without GNU? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#linuxsyswithoutgnu"&gt;#linuxsyswithoutgnu&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+&lt;dt id="linuxsyswithoutgnu"&gt;Are there complete Linux systems [sic] 
without GNU? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#linuxsyswithoutgnu"&gt;#linuxsyswithoutgnu&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
 There are complete systems that contain Linux and not GNU; Android is
@@ -1400,10 +1420,11 @@
 &ldquo;Linux&rdquo; with that principle.
 &lt;p&gt;
 Linus publicly states his disagreement with the free software
-movement's ideals.  He developed non-free software in his job for many
+movement's ideals.  He developed <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software in his job for many
 years (and said so to a large audience at a &ldquo;Linux&rdquo;World show), and
 publicly invited fellow developers of Linux, the kernel, to use
-non-free software to work on it with him.  He goes even further, and
+<span class="removed"><del><strong>non-free</strong></del></span>
+<span class="inserted"><ins><em>nonfree</em></ins></span> software to work on 
it with him.  He goes even further, and
 rebukes people who suggest that engineers and scientists should
 consider social consequences of our technical work&mdash;rejecting the
 lessons society learned from the development of the atom bomb.&lt;/p&gt;
@@ -1422,11 +1443,13 @@
     work as GNU? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#claimlinux"&gt;#claimlinux&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 It would be wrong, so we don't do that.  Torvalds' work is Linux, the
 kernel; we are careful not to attribute that work to the GNU Project
 or label it as &ldquo;GNU&rdquo;.  When we talk about the whole
 system, the name &ldquo;GNU/Linux&rdquo; gives him a share of the
-credit.
+<span class="removed"><del><strong>credit.</strong></del></span>
+<span class="inserted"><ins><em>credit.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 
@@ -1436,7 +1459,8 @@
 &lt;dd&gt;
 &lt;p&gt;He recognized this at the beginning.  The earliest Linux release notes
 said, &lt;a
-href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+<span 
class="removed"><del><strong>href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
 &ldquo;Most of the tools used with linux are GNU software and are under the
 GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
 for more info&rdquo;&lt;/a&gt;.&lt;/p&gt;
@@ -1454,7 +1478,7 @@
 a big job, and it's not clearly necessary.  The only thing ethically
 wrong with Linux as a kernel is its inclusion of firmware
 &ldquo;blobs&rdquo;; the best fix for that problem
-is &lt;a href="http://fsf.org/campaigns/priority-projects"&gt; developing
+is &lt;a <span 
class="removed"><del><strong>href="http://fsf.org/campaigns/priority-projects"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.fsf.org/campaigns/priority-projects"&gt;</em></ins></span>
 developing
 free replacement for the blobs&lt;/a&gt;.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -1463,12 +1487,13 @@
     it? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#lost"&gt;#lost&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 This isn't a battle, it is a campaign of education.  What to call the
 system is not a single decision, to be made at one moment by
 &ldquo;society&rdquo;: each person, each organization, can decide what
 name to use.  You can't make others say &ldquo;GNU/Linux&rdquo;, but
 you can decide to call the system &ldquo;GNU/Linux&rdquo;
-yourself&mdash;and by doing so, you will help educate others.
+yourself&mdash;and by doing so, you will help educate <span 
class="removed"><del><strong>others.</strong></del></span> <span 
class="inserted"><ins><em>others.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="whatgood"&gt;Society has made its
@@ -1476,6 +1501,7 @@
     &ldquo;GNU/Linux&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#whatgood"&gt;#whatgood&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 This is not an all-or-nothing situation: correct and incorrect
 pictures are being spread more or less by various people.  If you call
 the system &ldquo;GNU/Linux&rdquo;, you will help others learn the system's 
true
@@ -1483,7 +1509,7 @@
 everywhere on your own, any more than we can, but you can help.  If
 only a few hundred people see you use the term &ldquo;GNU/Linux&rdquo;, you 
will
 have educated a substantial number of people with very little work.
-And some of them will spread the correction to others.
+And some of them will spread the correction to <span 
class="removed"><del><strong>others.</strong></del></span> <span 
class="inserted"><ins><em>others.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="explain"&gt;Wouldn't it be better to call
@@ -1554,39 +1580,44 @@
     is it legitimate to rename the operating system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#rename"&gt;#rename&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 We are not renaming anything; we have been calling this system 
&ldquo;GNU&rdquo;
 ever since we announced it in 1983.  The people who tried to rename
-it to &ldquo;Linux&rdquo; should not have done so.&lt;/dd&gt;
+it to &ldquo;Linux&rdquo; should not have done <span 
class="removed"><del><strong>so.&lt;/dd&gt;</strong></del></span> <span 
class="inserted"><ins><em>so.&lt;/p&gt;
+&lt;/dd&gt;</em></ins></span>
 
 &lt;dt id="force"&gt;Isn't it wrong to force people to call
 the system &ldquo;GNU/Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#force"&gt;#force&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 It would be wrong to force them, and we don't try.  We call the system
-&ldquo;GNU/Linux&rdquo;, and we ask you to do it too.
+&ldquo;GNU/Linux&rdquo;, and we ask you to do it <span 
class="removed"><del><strong>too.</strong></del></span> <span 
class="inserted"><ins><em>too.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="whynotsue"&gt;Why not sue people who call
 the whole system &ldquo;Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#whynotsue"&gt;#whynotsue&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 There are no legal grounds to sue them, but since we believe in
 freedom of speech, we wouldn't want to do that anyway.  We ask people
-to call the system &ldquo;GNU/Linux&rdquo; because that is the right thing to 
do.
+to call the system &ldquo;GNU/Linux&rdquo; because that is the right thing to 
<span class="removed"><del><strong>do.</strong></del></span> <span 
class="inserted"><ins><em>do.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="require"&gt;Shouldn't you put something in
     the GNU GPL to require people to call the system &ldquo;GNU&rdquo;? 
&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#require"&gt;#require&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 The purpose of the GNU GPL is to protect the users' freedom from those
 who would make proprietary versions of free software.  While it is
 true that those who call the system &ldquo;Linux&rdquo; often do things that 
limit
-the users' freedom, such as bundling non-free software with the
-GNU/Linux system or even developing non-free software for such use,
+the users' freedom, such as bundling <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software with the
+GNU/Linux system or even developing <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software for such use,
 the mere act of calling the system &ldquo;Linux&rdquo; does not, in itself, 
deny
 users their freedom.  It seems improper to make the GPL restrict what
-name people can use for the system.
+name people can use for the <span 
class="removed"><del><strong>system.</strong></del></span> <span 
class="inserted"><ins><em>system.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="BSDlicense"&gt;Since you objected to the original BSD license's
@@ -1634,17 +1665,19 @@
 it &ldquo;Linux&rdquo;, doesn't that make it right? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#somanyright"&gt;#somanyright&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-We don't think that the popularity of an error makes it the truth.
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
+We don't think that the popularity of an error makes it the <span 
class="removed"><del><strong>truth.</strong></del></span> <span 
class="inserted"><ins><em>truth.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="knownname"&gt;Isn't it better to call the
     system by the name most users already know? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#knownname"&gt;#knownname&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo;
 includes &ldquo;Linux&rdquo;, they will recognize what you're talking
 about.  If you add &ldquo;(often erroneously referred to as
-&lsquo;Linux&rsquo;)&rdquo; once in a while, they will all understand.
+&lsquo;Linux&rsquo;)&rdquo; once in a while, they will all <span 
class="removed"><del><strong>understand.</strong></del></span> <span 
class="inserted"><ins><em>understand.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="winning"&gt;Many people care about what's
@@ -1654,7 +1687,7 @@
 
 &lt;dd&gt;
 To care only about what's convenient or who's winning is an amoral
-approach to life.  Non-free software is an example of that amoral
+approach to life.  <span 
class="removed"><del><strong>Non-free</strong></del></span>  <span 
class="inserted"><ins><em>Nonfree</em></ins></span> software is an example of 
that amoral
 approach and thrives on it.  Thus, in the long run it would be
 self-defeating for us to adopt that approach.  We will continue
 talking in terms of right and wrong.
@@ -1663,8 +1696,7 @@
 &lt;/dd&gt;
 
 &lt;/dl&gt;
-<span class="inserted"><ins><em>&lt;/div&gt;
-&lt;/div&gt;</em></ins></span>
+<span class="inserted"><ins><em>&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;
@@ -1713,7 +1745,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2001, <span class="removed"><del><strong>2006, 2007, 
2008,</strong></del></span> <span 
class="inserted"><ins><em>2006-2008,</em></ins></span> 2010, 2011, 2013, <span 
class="removed"><del><strong>2014, 2015</strong></del></span> <span 
class="inserted"><ins><em>2014-2018, 2020, 2021</em></ins></span>
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>2001, 2006, 2007, 
2008, 2010, 2011, 2013, 2014, 2015</strong></del></span> <span 
class="inserted"><ins><em>2001-2011, 2013-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"
@@ -1724,7 +1756,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/04/07 18:03:55 $
+$Date: 2021/08/30 13:34:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: gnu/po/gnu-linux-faq.pl.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.pl.po,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- gnu/po/gnu-linux-faq.pl.po  7 Apr 2021 18:03:55 -0000       1.86
+++ gnu/po/gnu-linux-faq.pl.po  30 Aug 2021 13:34:53 -0000      1.87
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2016-02-16 21:20-0600\n"
 "Last-Translator: Jan Owoc <jsowoc AT gmail.com>\n"
 "Language-Team: Polish <www-pl-trans@gnu.org>\n"
@@ -26,32 +26,18 @@
 msgid "GNU/Linux FAQ - GNU Project - Free Software Foundation"
 msgstr "GNU/Linux FAQ - Projekt GNU - Fundacja Wolnego Oprogramowania (FSF)"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU/Linux FAQ"
 msgstr ""
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 # || No change detected.  The change might only be in amounts of spaces.
 #, fuzzy
 #| msgid "by Richard Stallman"
 msgid "by Richard Stallman"
 msgstr "Richard Stallman"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
-"linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a href=\"/"
-"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Aby&nbsp;dowiedzieć się więcej o tym problemie, możecie również 
przeczytać "
-"naszą stronę <a href=\"/gnu/linux-and-gnu.html\">Linux i&nbsp;Projekt GNU</"
-"a>, stronę <a href=\"/gnu/why-gnu-linux.html\">Dlaczego GNU/Linux?</a> "
-"oraz&nbsp;stronę <a href=\"/gnu/gnu-users-never-heard-of-gnu.html"
-"\">Użytkownicy GNU, który nigdy nie słyszeli o GNU</a>."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When people see that we use and recommend the name GNU/Linux for a system "
 "that many others call just &ldquo;Linux&rdquo;, they ask many questions.  "
@@ -62,6 +48,10 @@
 "prostu &bdquo;Linux&rdquo;, zadają dużo pytań. Poniżej przedstawiono 
często "
 "spotykane pytania i&nbsp;nasze odpowiedzi. "
 
+#. type: Content of: <div><div><h3>
+msgid "Table of Contents"
+msgstr "Spis treści"
+
 #. type: Content of: <div><div><ul><li>
 # | <a href=\"#why\">Why do you call [-it-] {+the system we use+} GNU/Linux
 # | and not Linux?</a>
@@ -689,7 +679,34 @@
 "złu. Czy&nbsp;nie możecie zyskać większego poparcia z&nbsp;ich strony 
w&nbsp;"
 "inny sposób?</a>"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
+# | {+System</a>,+} our page on <a href=\"/gnu/why-gnu-linux.html\">Why
+# | GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our page on <a href=\"/"
+#| "gnu/linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a "
+#| "href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
+"linux-and-gnu.html\">Linux and the GNU System</a>, our page on <a href=\"/"
+"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Aby&nbsp;dowiedzieć się więcej o tym problemie, możecie również 
przeczytać "
+"naszą stronę <a href=\"/gnu/linux-and-gnu.html\">Linux i&nbsp;Projekt GNU</"
+"a>, stronę <a href=\"/gnu/why-gnu-linux.html\">Dlaczego GNU/Linux?</a> "
+"oraz&nbsp;stronę <a href=\"/gnu/gnu-users-never-heard-of-gnu.html"
+"\">Użytkownicy GNU, który nigdy nie słyszeli o GNU</a>."
+
+#. type: Content of: <div><dl><dt>
 # | Why do you call [-it-] {+the system we use+} GNU/Linux and not Linux?
 # | <span class=\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>
 #, fuzzy
@@ -703,7 +720,7 @@
 "Czemu nazywacie ten system GNU/Linux a&nbsp;nie Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#why\">#why</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Most operating system distributions based on Linux as kernel are basically "
 "modified versions of the GNU operating system.  We began developing GNU in "
@@ -722,11 +739,11 @@
 "głównych składników, wnosząc największy pojedynczy wkład 
do&nbsp;całości "
 "systemu. Zasadnicza wizja także była nasza."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "In fairness, we ought to get at least equal mention."
 msgstr "Sprawiedliwość nakazuje, że&nbsp;należy nam się takie samo 
uznanie."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and the GNU System</a> and <a "
 "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
@@ -739,7 +756,7 @@
 "polecamy <a href=\"/gnu/the-gnu-project.html\">Projekt GNU</a>, by poznać "
 "trochę historii."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why is the name important? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
@@ -747,7 +764,7 @@
 "Czemu ta nazwa jest ważna? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Although the developers of Linux, the kernel, are contributing to the free "
 "software community, many of them do not care about freedom.  People who "
@@ -762,7 +779,7 @@
 "odegrali. Potem przypisują nadmierną wagę do&nbsp;poglądów tych "
 "programistów. "
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Calling the system GNU/Linux recognizes the role that our idealism played in "
 "building our community, and <a href=\"/gnu/why-gnu-linux.html\">helps the "
@@ -772,20 +789,20 @@
 "w&nbsp;budowaniu naszej wspólnoty i&nbsp;<a href=\"/gnu/why-gnu-linux.html"
 "\">pomaga ogółowi poznawać praktyczne znaczenie tych ideałów</a>. "
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the real relationship between GNU and Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#what\">#what</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU operating system and the Linux kernel are separate software projects "
 "that do complementary jobs.  Typically they are packaged in a <a href=\"/"
 "distros/distros.html\">GNU/Linux distribution</a>, and used together."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How did it come about that most people call the system &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
@@ -795,7 +812,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; is a confusion that has spread faster "
 "than the corrective information."
@@ -803,7 +820,7 @@
 "Nazywanie systemu &bdquo;Linux&rdquo; to nieporozumienie, które "
 "rozprzestrzenia się szybciej niż korygująca je informacja."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who combined Linux with the GNU system were not aware that that's "
 "what their activity amounted to.  They focused their attention on the piece "
@@ -822,7 +839,7 @@
 "zwyczaju, zajęło nam kilka lat. W&nbsp;tym czasie nieporozumienie zdą
żyło "
 "się rozprzestrzenić."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the people who call the system &ldquo;Linux&rdquo; have never heard "
 "why that's not the right thing.  They saw others using that name and assume "
@@ -842,7 +859,7 @@
 "roku. To fałszywe przekonanie zazwyczaj wzmacnia pogląd, że&nbsp;ten 
system "
 "powinien być nazywany &bdquo;Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Many of the questions in this file represent people's attempts to justify "
 "the name they are accustomed to using."
@@ -850,7 +867,7 @@
 "Wiele pytań w&nbsp;tym dokumencie przedstawia próby usprawiedliwiania przez 
"
 "ludzi nazwy, której przyzwyczaili się używać."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we always say &ldquo;GNU/Linux&rdquo; instead of &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
@@ -859,7 +876,7 @@
 "Linux&rdquo;? <span class=\"anchor-reference-id\">(<a href=\"#always"
 "\">#always</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not always&mdash;only when you're talking about the whole system.  When "
 "you're referring specifically to the kernel, you should call it &ldquo;"
@@ -869,7 +886,7 @@
 "chodzi wam konkretnie o jądro, powinniście nazywać je &bdquo;Linux&rdquo;, 
"
 "tak jak nazwał je jego autor."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
 "call the whole system by the same name as the kernel.  This causes many "
@@ -886,7 +903,7 @@
 "Linuksem&rdquo;, a&nbsp;jądro &bdquo;Linuksem&rdquo;, unikacie "
 "niejednoznaczności. "
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Would Linux have achieved the same success if there had been no GNU? <span "
 "class=\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</"
@@ -895,7 +912,7 @@
 "Czy&nbsp;Linux osiągnąłby taki sam sukces gdyby nie było GNU?<span class="
 "\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In that alternative world, there would be nothing today like the GNU/Linux "
 "system, and probably no free operating system at all.  No one attempted to "
@@ -910,7 +927,7 @@
 "grupa Berkeley CSRG [Computer Systems Research Group], która była 
specjalnie "
 "poproszona przez Projekt GNU o rozpoczęcie uwalniania kodu."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds was partly influenced by a speech about GNU in Finland in "
 "1990.  It's possible that even without this influence he might have written "
@@ -925,7 +942,7 @@
 "Linus ponownie udostępnił go na&nbsp;warunkach licencji GNU GPL. 
(Zajrzyjcie "
 "do&nbsp;uwag towarzyszących wydaniu wersji 0.12.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Even if Torvalds had released Linux under some other free software license, "
 "a free kernel alone would not have made much difference to the world.  The "
@@ -937,7 +954,7 @@
 "jest wynikiem wpasowania się w&nbsp;większą strukturę, w&nbsp;kompletny "
 "wolny system operacyjny: GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better for the community if you did not divide people with "
 "this request? <span class=\"anchor-reference-id\">(<a href=\"#divide"
@@ -947,7 +964,7 @@
 "podziałów między ludźmi?  <span class=\"anchor-reference-id\">(<a href="
 "\"#divide\">#divide</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
 "people.  We are asking them to give the GNU Project credit for the GNU "
@@ -957,7 +974,7 @@
 "Chcemy, by uznali wkład Projektu GNU w&nbsp;tworzenie systemu operacyjnego "
 "GNU. Nie krytykujemy ani&nbsp;nie odpychamy nikogo."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, there are people who do not like our saying this.  Sometimes those "
 "people push us away in response.  On occasion they are so rude that one "
@@ -972,7 +989,7 @@
 "do&nbsp;podziałów w&nbsp;społeczności, więc&nbsp;mamy nadzieję, 
że&nbsp;"
 "przekonacie ich, by przestali."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, this is only a secondary cause of division in our community.  The "
 "largest division in the community is between people who appreciate free "
@@ -990,7 +1007,7 @@
 "oprogramowania] i&nbsp;przedstawiają wolne oprogramowanie jako efektywny "
 "model rozwoju oprogramowania (ruch open source)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This disagreement is not just a matter of names&mdash;it is a matter of "
 "differing basic values.  It is essential for the community to see and think "
@@ -1007,7 +1024,7 @@
 "open-source-misses-the-point.html\">&bdquo;Dlaczego termin Free Software "
 "jest lepszy niż Open Source&rdquo;</a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The disagreement over values partially aligns with the amount of attention "
 "people pay to the GNU Project's role in our community.  People who value "
@@ -1033,7 +1050,7 @@
 "(co nie będzie łatwe) lub&nbsp;zostaniemy pokonani (miejmy nadzieję, 
że&nbsp;"
 "do tego nie dojdzie). "
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Doesn't the GNU project support an individual's free speech rights to call "
 "the system by any name that individual chooses? <span class=\"anchor-"
@@ -1043,7 +1060,7 @@
 "systemu taką nazwą, jaką ta osoba wybierze? <span 
class=\"anchor-reference-id"
 "\">(<a href=\"#freespeech\">#freespeech</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Yes, indeed, we believe you have a free speech right to call the operating "
 "system by any name you wish.  We ask that people call it GNU/Linux as a "
@@ -1058,7 +1075,7 @@
 "informować innych, że&nbsp;te wartości wolności doprowadziły do&nbsp;"
 "powstania systemu operacyjnego."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since everyone knows the role of GNU in developing the system, doesn't the "
 "&ldquo;GNU/&rdquo; in the name go without saying? <span class=\"anchor-"
@@ -1069,7 +1086,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#everyoneknows"
 "\">#everyoneknows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Experience shows that the system's users, and the computer-using public in "
 "general, often know nothing about the GNU system.  Most articles about the "
@@ -1084,7 +1101,7 @@
 "\">Użytkownicy GNU, którzy nigdy nie słyszeli o GNU</a> wyjaśnia bardziej 
to "
 "zagadnienie."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who say this are probably geeks thinking of the geeks they know.  "
 "Geeks often do know about GNU, but many have a completely wrong idea of what "
@@ -1098,7 +1115,7 @@
 "\"#tools\">&bdquo;narzędzi&rdquo;</a> lub&nbsp;projekt mający na&nbsp;celu "
 "skonstruowanie takich narzędzi"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The wording of this question, which is typical, illustrates another common "
 "misconception.  To speak of &ldquo;GNU's role&rdquo; in developing something "
@@ -1112,7 +1129,7 @@
 "Miałoby sens mówić o roli Projektu GNU w&nbsp;takiej czy&nbsp;innej "
 "działalności, ale&nbsp;nie o roli GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since I know the role of GNU in this system, why does it matter what name I "
 "use? <span class=\"anchor-reference-id\">(<a href="
@@ -1122,7 +1139,7 @@
 "ma znaczenie, jakiej nazwy używam? <span class=\"anchor-reference-id\">(<a "
 "href=\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your words don't reflect your knowledge, you don't teach others.  Most "
 "people who have heard of the GNU/Linux system think it is &ldquo;"
@@ -1135,7 +1152,7 @@
 "Linusa Torvaldsa i&nbsp;pomyślany jako &bdquo;open source&rdquo;. "
 "Jeżeli&nbsp;im tego nie powiesz, to kto to zrobi?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't shortening &ldquo;GNU/Linux&rdquo; to &ldquo;Linux&rdquo; just like "
 "shortening &ldquo;Microsoft Windows&rdquo; to &ldquo;Windows&rdquo;? <span "
@@ -1146,7 +1163,7 @@
 "Windows&rdquo; do&nbsp;&bdquo;Windows&rdquo;? <span class=\"anchor-reference-"
 "id\">(<a href=\"#windows\">#windows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It's useful to shorten a frequently-used name, but not if the abbreviation "
 "is misleading."
@@ -1154,7 +1171,7 @@
 "Skracanie często używanych nazw jest użyteczne, ale&nbsp;nie wtedy, gdy "
 "skrót jest mylący."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Almost everyone in developed countries really does know that the &ldquo;"
 "Windows&rdquo; system is made by Microsoft, so shortening &ldquo;Microsoft "
@@ -1168,7 +1185,7 @@
 "w&nbsp;błąd odnośnie charakteru i&nbsp;pochodzenia systemu. Skrócenie 
&bdquo;"
 "GNU/Linux&rdquo; do&nbsp;&bdquo;Linux&rdquo; wprowadza w&nbsp;błąd."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The question is itself misleading because GNU and Microsoft are not the same "
 "kind of thing.  Microsoft is a company; GNU is an operating system."
@@ -1177,7 +1194,7 @@
 "należą do&nbsp;odrębnych kategorii. Microsoft jest firmą, a&nbsp;GNU jest 
"
 "systemem operacyjnym."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't GNU a collection of programming tools that were included in Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
@@ -1186,7 +1203,7 @@
 "do&nbsp;Linuksa? <span class=\"anchor-reference-id\">(<a href=\"#tools"
 "\">#tools</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "People who think that Linux is an entire operating system, if they hear "
 "about GNU at all, often get a wrong idea of what GNU is.  They may think "
@@ -1205,7 +1222,7 @@
 "operacyjnego, trudno pogodzić z&nbsp;całością wyobrażeń, w&nbsp;której 
ten "
 "system określany jest jako &bdquo;Linux&rdquo;. "
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Project was named after the GNU operating system&mdash;it's the "
 "project to develop the GNU system.  (See <a href=\"/gnu/initial-announcement."
@@ -1215,7 +1232,7 @@
 "projekt ten ma stworzyć system GNU. (Przeczytaj <a href=\"/gnu/initial-"
 "announcement.html\">pierwsze ogłoszenie z&nbsp;roku 1983</a>.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We developed programs such as GCC, GNU Emacs, GAS, GLIBC, BASH, etc., "
 "because we needed them for the GNU operating system.  GCC, the GNU Compiler "
@@ -1230,7 +1247,7 @@
 "GNU, stworzyliśmy również dla systemu GNU Ghostscript, GNUCash, GNU Chess "
 "i&nbsp;GNOME. "
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the difference between an operating system and a kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
@@ -1238,7 +1255,7 @@
 "Jaka jest różnica między systemem operacyjnym a&nbsp;jądrem? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "An operating system, as we use the term, means a collection of programs that "
 "are sufficient to use the computer to do a wide variety of jobs.  A general "
@@ -1251,7 +1268,7 @@
 "przeznaczenia był kompletny, powinien umożliwić wykonanie wszystkich 
zadań, "
 "jakie wielu użytkowników chciałoby wykonać."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The kernel is one of the programs in an operating system&mdash;the program "
 "that allocates the machine's resources to the other programs that are "
@@ -1262,7 +1279,7 @@
 "Jądro zajmuje się również uruchamianiem i&nbsp;zatrzymywaniem innych "
 "programów."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "To confuse matters, some people use the term &ldquo;operating system&rdquo; "
 "to mean &ldquo;kernel&rdquo;.  Both uses of the term go back many years.  "
@@ -1284,7 +1301,7 @@
 "nawet gry. Ponieważ&nbsp;chcieliśmy, by GNU był systemem uniksopodobnym, "
 "używamy terminu &bdquo;system operacyjny&rdquo; w&nbsp;ten sam sposób."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the time when people speak of the &ldquo;Linux operating "
 "system&rdquo; they are using &ldquo;operating system&rdquo; in the same "
@@ -1303,7 +1320,7 @@
 "jądro&rdquo;, aby&nbsp;uniknąć dwuznaczności w&nbsp;określaniu, o którą
 "
 "część oprogramowania wam chodzi."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
@@ -1315,7 +1332,7 @@
 "określenie całego zbioru oprogramowania, to w&nbsp;porządku. Wtedy 
będziecie "
 "mówić o dystrybucjach systemu GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The kernel of a system is like the foundation of a house.  How can a house "
 "be almost complete when it doesn't have a foundation? <span class=\"anchor-"
@@ -1325,7 +1342,7 @@
 "kiedy nie posiada fundamentów? <span class=\"anchor-reference-id\">(<a href="
 "\"#house\">#house</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "A kernel is not much like the foundation of a house because building an "
 "operating system is not much like building a house."
@@ -1333,7 +1350,7 @@
 "Jądro nie jest takie ważne jak fundamenty domu, ponieważ&nbsp;tworzenie "
 "systemu operacyjnego nie jest tak dużym przedsięwzięciem jak budowanie 
domu."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A house is built from lots of little general parts that are cut and put "
 "together in situ.  They have to be put together from the bottom up.  Thus, "
@@ -1346,7 +1363,7 @@
 "żadne istotne części nie zostały zbudowane. Jedyne co macie to wielką 
dziurę "
 "w&nbsp;ziemi."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "By contrast, an operating system consists of complex components that can be "
 "developed in any order.  When you have developed most of the components, "
@@ -1363,7 +1380,7 @@
 "oczekiwały na&nbsp;kolejny istotny moduł, będzie to tym samym co system 
GNU "
 "w&nbsp;1992 roku."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't the kernel the brain of the system? <span class=\"anchor-reference-id"
 "\">(<a href=\"#brain\">#brain</a>)</span>"
@@ -1371,7 +1388,7 @@
 "Czy&nbsp;to nie jądro jest mózgiem systemu? <span 
class=\"anchor-reference-id"
 "\">(<a href=\"#brain\">#brain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A computer system is not much like a human body, and no part of it plays a "
 "role comparable to that of the brain in a human."
@@ -1379,7 +1396,7 @@
 "System komputerowy nie jest taki jak ludzkie ciało i&nbsp;żadna jego 
część "
 "nie odgrywa takiej roli jak mózg u&nbsp;człowieka."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't writing the kernel most of the work in an operating system? <span "
 "class=\"anchor-reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</"
@@ -1389,12 +1406,12 @@
 "operacyjnego?<span class=\"anchor-reference-id\">(<a href=\"#kernelmost"
 "\">#kernelmost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "No, many components take a lot of work."
 msgstr ""
 "Nie, wiele [<em>innych</em>] elementów wymaga [<em>równie</em>] dużo 
pracy."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Isn't writing-]{+An operating system requires a kernel.  Since+} the
 # | [-kernel most of-] {+GNU Project didn't develop a kernel, how can+} the
 # | [-work in an operating system? <span-] {+system be GNU?<span+}
@@ -1415,7 +1432,7 @@
 "operacyjnego?<span class=\"anchor-reference-id\">(<a href=\"#kernelmost"
 "\">#kernelmost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The people who argue that way for calling the system &ldquo;Linux&rdquo; are "
 "using a double standard.  An operating system requires compilers, editors, "
@@ -1424,20 +1441,20 @@
 "any of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "That standard is too strict, not the right way to judge the contributions of "
 "any contributor."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds made an important contribution to the operating system we "
 "use; the GNU Project started earlier and contributed much more.  The name "
 "&ldquo;GNU/Linux&rdquo; gives credit to each."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How can GNU be an operating system, if I can't get something called &ldquo;"
 "GNU&rdquo; and install it? <span class=\"anchor-reference-id\">(<a href="
@@ -1447,7 +1464,7 @@
 "&bdquo;GNU&rdquo; i&nbsp;zainstalować? <span class=\"anchor-reference-id\">"
 "(<a href=\"#notinstallable\">#notinstallable</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Many <a href=\"/distros/distros.html\"> packaged and installable versions of "
 "GNU</a> are available.  None of them is called simply &ldquo;GNU&rdquo;, but "
@@ -1457,7 +1474,7 @@
 "gotowych do&nbsp;zainstalowania wersji GNU</a>. Żadne z&nbsp;nich nie nosi "
 "nazwy po&nbsp;prostu &bdquo;GNU&rdquo;, ale&nbsp;w zasadzie one są GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We expected to release the GNU system packaged for installation, but this "
 "plan was overtaken by events: in 1992 others were already packaging GNU "
@@ -1477,7 +1494,7 @@
 "aby&nbsp;nazywał system jedynie &bdquo;GNU&rdquo; ponieważ&nbsp;to miała 
być "
 "nazwa systemu z&nbsp;jądrem GNU Hurd, które jeszcze nie było gotowe."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Hurd kernel never became sufficiently ready; we only recommend it to "
 "those interested in working on it.  So we never packaged GNU with the GNU "
@@ -1488,7 +1505,7 @@
 "z&nbsp;jądrem GNU Hurd. Jednakże, Debian zapakował tę kombinację jako 
Debian "
 "GNU/Hurd."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are now developing an advanced Scheme-based package manager called Guix "
 "and a complete system distribution based on it called the <a href=\"/"
@@ -1500,7 +1517,7 @@
 "\"/software/guix\">Guix System Distribution </a>lub&nbsp;GuixSD. To wlicza "
 "pakowanie znacznej części systemu GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We never took the last step of packaging GNU under the name &ldquo;"
 "GNU&rdquo;, but that doesn't alter what kind of thing GNU is.  GNU is an "
@@ -1510,7 +1527,7 @@
 "GNU&rdquo;, ale&nbsp;to nie zmienia istoty GNU. GNU jest systemem "
 "operacyjnym."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "We're calling the whole system after the kernel, Linux.  Isn't it normal to "
 "name an operating system after a kernel? <span class=\"anchor-reference-id\">"
@@ -1520,7 +1537,7 @@
 "nazywanie systemu tak jak nazywa się jądro? <span 
class=\"anchor-reference-id"
 "\">(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "That practice seems to be very rare&mdash;we can't find any examples other "
 "than the misuse of the name &ldquo;Linux&rdquo;.  Normally an operating "
@@ -1536,7 +1553,7 @@
 "nazwy, zamiast tego ludzie mówią &bdquo;jądro takiego-a-takiego [systemu "
 "operacyjnego]&rdquo; lub&nbsp;&bdquo;takie-a-takie jądro&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Because those two constructions are used synonymously, the expression &ldquo;"
 "the Linux kernel&rdquo; can easily be misunderstood as meaning &ldquo;the "
@@ -1551,7 +1568,7 @@
 "mówienie lub&nbsp;pisanie &bdquo;jądro o nazwie Linux&rdquo; 
lub&nbsp;&bdquo;"
 "Linux, jądro&rdquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can another system have &ldquo;the feel of Linux&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
@@ -1559,7 +1576,7 @@
 "Czy&nbsp;inny system może &bdquo;zachowywać się jak Linux&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is no such thing as the &ldquo;feel of Linux&rdquo; because Linux has "
 "no user interfaces.  Like any modern kernel, Linux is a base for running "
@@ -1574,7 +1591,7 @@
 "się odbywa przez inne programy, i&nbsp;&bdquo;zachowanie&rdquo; od&nbsp;nich 
"
 "zależy."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  How about "
 "recommending a shorter name? <span class=\"anchor-reference-id\">(<a href="
@@ -1584,7 +1601,7 @@
 "Może zaproponujecie krótszą nazwę? <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#long\">#long</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "For a while we tried the name &ldquo;LiGNUx&rdquo;, which combines the words "
 "&ldquo;GNU&rdquo; and &ldquo;Linux&rdquo;.  The reaction was very bad.  "
@@ -1595,7 +1612,7 @@
 "na&nbsp;nią była bardzo zła. Ludzie częściej akceptowali określenie 
&bdquo;"
 "GNU/Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
 "call it &ldquo;GNU/Linux&rdquo; <a href=\"#justgnu\"> for the reasons given "
@@ -1605,14 +1622,14 @@
 "GNU&rdquo;, jednak&nbsp;nazywamy go &bdquo;GNU/Linux&rdquo; <a href="
 "\"#justgnu\">z&nbsp;powodów podanych poniżej</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How about calling the system &ldquo;GliNUx&rdquo; (instead of &ldquo;GNU/"
 "Linux&rdquo;)? <span class=\"anchor-reference-id\">(<a href="
 "\"#long1\">#long1</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The name &ldquo;GNU&rdquo; does not visibly appear in &ldquo;Glinux,&rdquo; "
 "so most people would not notice it is there.  Even if it is capitalized as "
@@ -1620,13 +1637,13 @@
 "reference to GNU."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be comparable to writing &ldquo;GNU/Linux,&rdquo; but putting "
 "&ldquo;GNU/&rdquo; in print so small that most people could not read it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  Why should "
 "I go to the trouble of saying &ldquo;GNU/&rdquo;? <span class=\"anchor-"
@@ -1636,7 +1653,7 @@
 "Dlaczego mam się wysilać aby&nbsp;mówić &bdquo;GNU/&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#long\">#long2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
 "the system that we developed, can't you take one second to recognize our "
@@ -1646,7 +1663,7 @@
 "&rdquo;. Jeśli doceniacie system, który rozwinęliśmy, czy&nbsp;nie 
możecie "
 "przez tą sekundę uznać naszej pracy?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Unfortunately, &ldquo;GNU/Linux&rdquo; is five syllables. People won't use "
 "such a long term. Shouldn't you find a shorter one? <span class=\"anchor-"
@@ -1656,7 +1673,7 @@
 "używali tak długiej nazwy. Nie powinniście znaleźć krótszej? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#long3\">#long3</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, &ldquo;GNU/Linux&rdquo; is only four syllables.  &ldquo;"
 "Unfortunately&rdquo; is five syllables, yet people show no sign of "
@@ -1665,7 +1682,7 @@
 "Słowo &bdquo;niestety&rdquo; też ma cztery sylaby, a&nbsp;ludzie wcale się 
"
 "nie od&nbsp;tego słowa nie stronią."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  Why
 # | should I go-]{+Stallman doesn't ask us+} to {+call him &ldquo;Richard
 # | Matthew Stallman&rdquo; every+} the [-trouble of saying
@@ -1687,21 +1704,21 @@
 "Dlaczego mam się wysilać aby&nbsp;mówić &bdquo;GNU/&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#long\">#long2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Omitting &ldquo;Matthew&rdquo; does not misrepresent anything important "
 "about Stallman's nature, origin, ideas or purpose.  Omitting &ldquo;"
 "GNU&rdquo; does misrepresent those things about the GNU/Linux system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is an example of a frequent way of hiding a fallacy: to bury it inside "
 "a misleading analogy.  A better analogy would be, &ldquo;Why shouldn't we "
 "call Stallman &lsquo;Torvalds&rsquo;?&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since Linux is a secondary contribution, would it be false to the facts to "
 "call the system simply &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id"
@@ -1711,7 +1728,7 @@
 "nazwanie systemu po&nbsp;prostu &bdquo;GNU&rdquo;? <span class=\"anchor-"
 "reference-id\">(<a href=\"#justgnu\">#tylkognu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would not be false to the facts, but it is not the best thing to do.  "
 "Here are the reasons we call that system version &ldquo;GNU/Linux&rdquo; "
@@ -1721,7 +1738,7 @@
 "których nazywamy tę wersję systemu &bdquo;GNU/Linux&rdquo;, a&nbsp;nie "
 "&bdquo;GNU&rdquo;:"
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It's not exactly GNU&mdash;it has a different kernel (that is, Linux).  "
 "Distinguishing GNU/Linux from GNU is useful."
@@ -1730,7 +1747,7 @@
 "Linuksa). Odróżnienie GNU/Linuksa od&nbsp;GNU jest w&nbsp;tej sytuacji "
 "użyteczne."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It would be ungentlemanly to ask people to <em>stop</em> giving any credit "
 "to Linus Torvalds.  He did write an important component of the system.  We "
@@ -1751,7 +1768,7 @@
 "próbujemy pozbawić Linusa uznania należnego mu za&nbsp;przyczynienie się "
 "do&nbsp;rozwoju systemu."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
 "&ldquo;GNU&rdquo; they may simply not recognize we're talking about the same "
@@ -1764,7 +1781,7 @@
 "nazwy &bdquo;GNU/Linux&rdquo;, połączą to z&nbsp;tym, co słyszeli o 
systemie "
 "Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "I would have to pay a fee if I use &ldquo;Linux&rdquo; in the name of a "
 "product, and that would also apply if I say &ldquo;GNU/Linux&rdquo;.  Is it "
@@ -1778,7 +1795,7 @@
 "bez&nbsp;&bdquo;Linux&rdquo;, to jest to nieuczciwe? <span class=\"anchor-"
 "reference-id\">(<a href=\"#trademarkfee\">#trademarkfee</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There's nothing wrong in calling the system &ldquo;GNU&rdquo;; basically, "
 "that's what it is.  It is nice to give Linus Torvalds a share of the credit "
@@ -1789,7 +1806,7 @@
 "Torvaldsowi należnej mu części uznania jest uprzejme, ale&nbsp;nie macie "
 "obowiązku płacić za&nbsp;przywilej wyrażenia swego uznania."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "So if you want to refer to the system simply as &ldquo;GNU&rdquo;, to avoid "
 "paying the fee for calling it &ldquo;Linux&rdquo;, we won't criticize you."
@@ -1798,7 +1815,7 @@
 "Linuksem&rdquo; chcecie określać ten system po&nbsp;prostu jako &bdquo;"
 "GNU&rdquo;, nie będziemy Was za&nbsp;to krytykować."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today; it includes "
 "TeX, X11, Apache, Perl, and many more programs.  Don't your arguments imply "
@@ -1812,7 +1829,7 @@
 "ich wkład? (Ale to doprowadziłoby do&nbsp;absurdalnie długich nazw) <span "
 "class=\"anchor-reference-id\">(<a href=\"#many\">#many</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "What we say is that you ought to give the system's principal developer a "
 "share of the credit.  The principal developer is the GNU Project, and the "
@@ -1821,7 +1838,7 @@
 "Mówimy tylko, że&nbsp;powinniście wspomnieć również o głównym twórcy 
"
 "systemu. Głównym twórcą jest Projekt GNU, a&nbsp;system to zasadniczo 
GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you feel even more strongly about giving credit where it is due, you "
 "might feel that some secondary contributors also deserve credit in the "
@@ -1839,7 +1856,7 @@
 "X11/Linux, to róbcie tak. Jeżeli&nbsp;czujecie, że&nbsp;Perl aż się 
prosi o "
 "wspomnienie i&nbsp;chcecie pisać: GNU/Linux/Perl, to śmiało."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Since a long name such as GNU/X11/Apache/Linux/TeX/Perl/Python/FreeCiv "
 "becomes absurd, at some point you will have to set a threshold and omit the "
@@ -1853,7 +1870,7 @@
 "w&nbsp;oczywisty sposób właściwego miejsca na&nbsp;ustawienie takiego 
progu, "
 "więc&nbsp;gdziekolwiek go ustawicie, nie będziemy się o to sprzeczać."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Different threshold levels would lead to different choices of name for the "
 "system.  But one name that cannot result from concerns of fairness and "
@@ -1867,7 +1884,7 @@
 "uznanie zasług jednego drugorzędnego projektu mającego swój wkład 
(Linux) "
 "przy pominięciu głównego&ndash;projektu (GNU)."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Many companies contributed to-]{+systemd plays an important role in+}
 # | the {+GNU/Linux+} system as it is today; [-doesn't that mean-] {+are+} we
 # | [-ought-] {+obligated+} to call it [-GNU/Red&nbsp;Hat/Novell/Linux?-]
@@ -1890,7 +1907,7 @@
 "Red&nbsp;hat/Novell/Linux? <span class=\"anchor-reference-id\">(<a href="
 "\"#manycompanies\">#manycompanies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "systemd is a fairly important component, but not as important as the kernel "
 "(Linux), nor as important as the basis of the system as a whole (GNU).  "
@@ -1898,7 +1915,7 @@
 "system &ldquo;GNU/systemd/Linux&rdquo;, there is nothing wrong with doing so."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today, but they don't "
 "insist on calling it XYZ/Linux.  Why should we treat GNU specially? <span "
@@ -1909,7 +1926,7 @@
 "Czemu mielibyśmy traktować GNU w&nbsp;specjalny sposób? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#others\">#others</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Thousands of projects have developed programs commonly included in today's "
 "GNU/Linux systems.  They all deserve credit for their contributions, but "
@@ -1922,7 +1939,7 @@
 "ale&nbsp;nie są głównymi twórcami systemu jako całości, więc&nbsp;nie "
 "proszą, żeby je jako takich honorowano."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is different because it is more than just a contributed program, more "
 "than just a collection of contributed programs.  GNU is the framework on "
@@ -1932,7 +1949,7 @@
 "programem, więcej niż zbiorem wniesionych programów. GNU jest zrębem, "
 "na&nbsp;bazie którego zbudowano ten system."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "GNU is a small fraction of the system nowadays, so why should we mention it? "
 "<span class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</"
@@ -1942,7 +1959,7 @@
 "o nim wspominać? <span class=\"anchor-reference-id\">(<a href=\"#allsmall"
 "\">#allsmall</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In 2008, we found that GNU packages made up 15% of the &ldquo;main&rdquo; "
 "repository of the gNewSense GNU/Linux distribution.  Linux made up 1.5%.  So "
@@ -1954,7 +1971,7 @@
 "argument powinien Was przekonać do&nbsp;mówienia czegoś więcej, niż samo 
"
 "&bdquo;Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is a small fraction of the system nowadays, and Linux is an even smaller "
 "fraction.  But they are the system's core; the system was made by combining "
@@ -1965,7 +1982,7 @@
 "powstał poprzez&nbsp;ich połączenie. Tak więc&nbsp;nazwa &bdquo;GNU/"
 "Linux&rdquo; w&nbsp;dalszym ciągu pozostaje właściwa."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many companies contributed to the system as it is today; doesn't that mean "
 "we ought to call it GNU/Red&nbsp;Hat/Novell/Linux? <span class=\"anchor-"
@@ -1976,7 +1993,7 @@
 "Red&nbsp;hat/Novell/Linux? <span class=\"anchor-reference-id\">(<a href="
 "\"#manycompanies\">#manycompanies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is not comparable to Red Hat or Novell; it is not a company, or an "
 "organization, or even an activity.  GNU is an operating system.  (When we "
@@ -1990,7 +2007,7 @@
 "którego celem jest rozwijanie systemu GNU). System GNU/Linux bazuje na&nbsp;"
 "GNU i&nbsp;dlatego GNU powinno się pojawić w&nbsp;jego nazwie."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Much of those companies' contribution to the GNU/Linux system lies in the "
 "code they have contributed to various GNU packages including GCC and GNOME.  "
@@ -2002,7 +2019,7 @@
 "GNOME. Nazywając system GNU/Linuksem uhonorowuje się te firmy 
na&nbsp;równi "
 "ze wszystkimi innymi twórcami GNU. "
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
@@ -2012,7 +2029,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean "
@@ -2025,7 +2042,7 @@
 "albo&nbsp;&bdquo;Linux, który jest pakietem GNU&rdquo;. Żadne z&nbsp;tych "
 "dwóch znaczeń nie jest dobrym opisem sytuacji."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is not a GNU package; that is, it wasn't developed under the GNU "
 "Project's aegis or contributed specifically to the GNU Project.  Linus "
@@ -2038,14 +2055,32 @@
 "Znaczenie &bdquo;Linux, który jest pakietem GNU&rdquo; jest więc&nbsp;"
 "nieprawidłowe."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | We're not talking about a distinct GNU version of Linux, the kernel.  The
+# | free GNU/Linux distros do have a <a
+# | [-href=\"http://directory.fsf.org/project/linux\";>separate-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>separate+} version
+# | of Linux</a>, since the &ldquo;standard&rdquo; version contains
+# | non[---]free firmware &ldquo;blobs&rdquo;.  If this were part of the GNU
+# | Project, it could be considered &ldquo;GNU Linux&rdquo;; but we would not
+# | want to call it that, because it would be too confusing.
+#, fuzzy
+#| msgid ""
+#| "We're not talking about a distinct GNU version of Linux, the kernel.  The "
+#| "free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/";
+#| "project/linux\">separate version of Linux</a>, since the &ldquo;"
+#| "standard&rdquo; version contains non-free firmware &ldquo;blobs&rdquo;.  "
+#| "If this were part of the GNU Project, it could be considered &ldquo;GNU "
+#| "Linux&rdquo;; but we would not want to call it that, because it would be "
+#| "too confusing."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
-"free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/project/";
-"linux\">separate version of Linux</a>, since the &ldquo;standard&rdquo; "
-"version contains non-free firmware &ldquo;blobs&rdquo;.  If this were part "
-"of the GNU Project, it could be considered &ldquo;GNU Linux&rdquo;; but we "
-"would not want to call it that, because it would be too confusing."
+"free GNU/Linux distros do have a <a href=\"https://directory.fsf.org/wiki/";
+"Linux-libre\">separate version of Linux</a>, since the &ldquo;"
+"standard&rdquo; version contains nonfree firmware &ldquo;blobs&rdquo;.  If "
+"this were part of the GNU Project, it could be considered &ldquo;GNU "
+"Linux&rdquo;; but we would not want to call it that, because it would be too "
+"confusing."
 msgstr ""
 "Nie mamy na&nbsp;myśli odrębnej wersji GNU jądra Linux. Wolne dystrybucje "
 "GNU/Linuksa posiadają <a href=\"http://directory.fsf.org/project/linux";
@@ -2055,7 +2090,7 @@
 "jednak&nbsp;nie chcemy używać takiej nazwy, ponieważ&nbsp;byłaby ona zbyt 
"
 "myląca."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We're talking about a version of GNU, the operating system, distinguished by "
 "having Linux as the kernel.  A slash fits the situation because it means "
@@ -2068,7 +2103,7 @@
 "Wejście/Wyjście&rdquo;). Ten system jest połączeniem GNU i&nbsp;Linuksa, "
 "stąd &bdquo;GNU/Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are other ways to express &ldquo;combination&rdquo;.  If you think "
 "that a plus-sign is clearer, please use that.  In French, a hyphen is clear: "
@@ -2080,7 +2115,7 @@
 "francuskim oczywisty jest myślnik: &bdquo;GNU-Linux&rdquo;. Po&nbsp;"
 "hiszpańsku czasami mówimy &bdquo;GNU con Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | [-Should we say &ldquo;GNU/BSD&rdquo; too?-]{+How is the name
 # | &ldquo;GNU/Linux&rdquo; pronounced?+} <span
 # | class=\"anchor-reference-id\">(<a [-href=\"#bsd\">#bsd</a>)</span>-]
@@ -2096,14 +2131,14 @@
 "Czy&nbsp;powinniśmy również mówić &bdquo;GNU/BSD&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please pronounce it as &ldquo;GNU slash Linux.&rdquo; If you don't pronounce "
 "the slash, people will think you are saying &ldquo;GNU Linux,&rdquo; which "
 "is <a href=\"#whyslash\">not a suitable name for the combination</a>."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 # | Why do you write [-&ldquo;GNU/Linux&rdquo; instead of-] &ldquo;GNU
 # | [-Linux&rdquo;?-] {+Emacs&rdquo; rather than &ldquo;GNU/Emacs&rdquo;?+}
 # | <span class=\"anchor-reference-id\">(<a
@@ -2123,7 +2158,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 # | Following the rules of English, in the construction &ldquo;GNU
 # | [-Linux&rdquo;-] {+Emacs&rdquo;+} the word &ldquo;GNU&rdquo; modifies
 # | [-&ldquo;Linux&rdquo;.  This can mean either &ldquo;GNU's version of
@@ -2148,14 +2183,14 @@
 "albo&nbsp;&bdquo;Linux, który jest pakietem GNU&rdquo;. Żadne z&nbsp;tych "
 "dwóch znaczeń nie jest dobrym opisem sytuacji."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;GNU/Emacs&rdquo; would mean the combination of GNU, the operating "
 "system, and the program Emacs.  That doesn't fit this program, so &ldquo;GNU/"
 "Emacs&rdquo; is the wrong way to refer to it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why &ldquo;GNU/Linux&rdquo; rather than &ldquo;Linux/GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
@@ -2164,7 +2199,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is right and proper to mention the principal contribution first.  The GNU "
 "contribution to the system is not only bigger than Linux and prior to Linux, "
@@ -2174,13 +2209,13 @@
 "właściwe. Wkład do&nbsp;systemu wniesiony przez GNU jest nie tylko 
większy "
 "i&nbsp;wcześniejszy niż Linux. To my zaczęliśmy całą działalność."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the lowest "
 "level of the system and GNU fills technically higher levels."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
 "lot better than what people usually do, which is to omit GNU entirely and "
@@ -2191,7 +2226,7 @@
 "całkowite opuszczanie GNU i&nbsp;powodowanie przez to wrażenia, 
że&nbsp;cały "
 "system to Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
 "say anything about what the system consists of.  Why shouldn't they call it "
@@ -2203,7 +2238,7 @@
 "chcą? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames0\">#distronames0</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling a system &ldquo;Foobar Linux&rdquo; implies that it's a flavor of "
 "&ldquo;Linux,&rdquo; and people <a href=\"#distronames\">understand it that "
@@ -2213,7 +2248,7 @@
 "&bdquo;Linuksa&rdquo; i&nbsp;tak to ludzie <a href=\"#distronames"
 "\">rozumieją</a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If they called a GNU/Linux distro &ldquo;Foobar BSD,&rdquo; you would call "
 "that a mistake.  &ldquo;This system is not BSD,&rdquo; you would tell them.  "
@@ -2223,7 +2258,7 @@
 "uważalibyście to za&nbsp;błąd. Powiedzielibyście: &bdquo;Ten system nie 
jest "
 "BSD&rdquo;. Przecież nie jest też Linuksem."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro is called &ldquo;Foobar Linux&rdquo;; doesn't that show it's "
 "really Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
@@ -2233,7 +2268,7 @@
 "to, że&nbsp;to naprawdę jest Linux? <span class=\"anchor-reference-id\">(<a 
"
 "href=\"#distronames\">#distronames</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It means that the people who make the &ldquo;Foobar Linux&rdquo; distro are "
 "repeating the common mistake. We appreciate that distributions like Debian, "
@@ -2247,7 +2282,7 @@
 "oficjalnej nazwy i&nbsp;mamy nadzieję, że&nbsp;jeśli Wy jesteście 
częścią "
 "innej dystrybucji, skłonicie ją aby&nbsp;zrobiła tak samo."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's official name is &ldquo;Foobar Linux&rdquo;; isn't it wrong to "
 "call the distro anything but &ldquo;Foobar Linux&rdquo;? <span class="
@@ -2258,7 +2293,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#distronames1\">#distronames1</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 # | [-If it's allowed for them to change-]{+When they spread misinformation by
 # | changing+} &ldquo;GNU&rdquo; to &ldquo;Linux&rdquo;, {+and call their
 # | version of it &ldquo;Foobar Linux&rdquo;,+} it's [-allowed-] {+proper+}
@@ -2282,7 +2317,7 @@
 "dystrybucję &bdquo;Foobar GNU/Linux&rdquo;. To jest co powinniście robić "
 "aby&nbsp;unikać ich błędu."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be more effective to ask companies such as Mandrake, Red Hat and "
 "IBM to call their distributions &ldquo;GNU/Linux&rdquo; rather than asking "
@@ -2294,7 +2329,7 @@
 "rezultatów niż zwracanie się z&nbsp;tym do&nbsp;pojedynczych osób? <span "
 "class=\"anchor-reference-id\">(<a href=\"#companies\">#companies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It isn't a choice of one or the other&mdash;we ask companies and "
 "organizations and individuals to help spread the word about this.  In fact, "
@@ -2314,7 +2349,7 @@
 "Linux&rsquo;&rdquo;. Innymi słowy, ta firma nie troszczyła się o to, co 
jest "
 "słuszne."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We can't make them do this right, but we're not the sort to give up just "
 "because the road isn't easy.  You may not have as much influence at your "
@@ -2328,7 +2363,7 @@
 "mimo to możecie pomóc. Razem możemy zmienić sytuację na&nbsp;tyle, 
że&nbsp;"
 "firmy będą zarabiały więcej nazywając system &bdquo;GNU/Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to reserve the name &ldquo;GNU/Linux&rdquo; for "
 "distributions that are purely free software? After all, that is the ideal of "
@@ -2340,15 +2375,35 @@
 "jest ideał projektu GNU. <span class=\"anchor-reference-id\">(<a href="
 "\"#reserve\">#reserve</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+# | The widespread practice of adding non[---]free software to the GNU/Linux
+# | system is a major problem for our community.  It teaches the users that
+# | non[---]free software is ok, and that using it is part of the spirit of
+# | &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of
+# | their mission to help users use non[---]free add-ons, and may even invite
+# | salesmen to come and make sales pitches for them.  They adopt goals such
+# | as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them
+# | use non[---]free applications and drivers), or making the system more
+# | popular even at the cost of freedom.
+#, fuzzy
+#| msgid ""
+#| "The widespread practice of adding non-free software to the GNU/Linux "
+#| "system is a major problem for our community.  It teaches the users that "
+#| "non-free software is ok, and that using it is part of the spirit of "
+#| "&ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part "
+#| "of their mission to help users use non-free add-ons, and may even invite "
+#| "salesmen to come and make sales pitches for them.  They adopt goals such "
+#| "as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them "
+#| "use non-free applications and drivers), or making the system more popular "
+#| "even at the cost of freedom."
 msgid ""
-"The widespread practice of adding non-free software to the GNU/Linux system "
-"is a major problem for our community.  It teaches the users that non-free "
+"The widespread practice of adding nonfree software to the GNU/Linux system "
+"is a major problem for our community.  It teaches the users that nonfree "
 "software is ok, and that using it is part of the spirit of &ldquo;"
 "Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of their "
-"mission to help users use non-free add-ons, and may even invite salesmen to "
+"mission to help users use nonfree add-ons, and may even invite salesmen to "
 "come and make sales pitches for them.  They adopt goals such as &ldquo;"
-"helping the users&rdquo; of GNU/Linux (including helping them use non-free "
+"helping the users&rdquo; of GNU/Linux (including helping them use nonfree "
 "applications and drivers), or making the system more popular even at the "
 "cost of freedom."
 msgstr ""
@@ -2363,11 +2418,11 @@
 "w&nbsp;to pomoc w&nbsp;używaniu nie-wolnych aplikacji i&nbsp;sterowników), "
 "lub&nbsp;upowszechnianie systemu nawet za&nbsp;cenę wolności."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The question is how to try to change this."
 msgstr "Pytanie brzmi: jak próbować to zmienić."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Given that most of the community which uses GNU with Linux already does not "
 "realize that's what it is, for us to disown these adulterated versions, "
@@ -2383,13 +2438,29 @@
 "dotarłoby do&nbsp;nich. Odpowiedzieliby przede wszystkim, że&nbsp;nie "
 "myśleli o tych systemach jako o GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The way to lead these users to see a connection with freedom is exactly
+# | the opposite: to inform them that all these system versions <em>are</em>
+# | versions of GNU, that they all are based on a system that exists
+# | specifically for the sake of the users' freedom.  With this understanding,
+# | they can start to recognize the distributions that include non[---]free
+# | software as perverted, adulterated versions of GNU, instead of thinking
+# | they are proper and appropriate &ldquo;versions of Linux&rdquo;.
+#, fuzzy
+#| msgid ""
+#| "The way to lead these users to see a connection with freedom is exactly "
+#| "the opposite: to inform them that all these system versions <em>are</em> "
+#| "versions of GNU, that they all are based on a system that exists "
+#| "specifically for the sake of the users' freedom.  With this "
+#| "understanding, they can start to recognize the distributions that include "
+#| "non-free software as perverted, adulterated versions of GNU, instead of "
+#| "thinking they are proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgid ""
 "The way to lead these users to see a connection with freedom is exactly the "
 "opposite: to inform them that all these system versions <em>are</em> "
 "versions of GNU, that they all are based on a system that exists "
 "specifically for the sake of the users' freedom.  With this understanding, "
-"they can start to recognize the distributions that include non-free software "
+"they can start to recognize the distributions that include nonfree software "
 "as perverted, adulterated versions of GNU, instead of thinking they are "
 "proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgstr ""
@@ -2402,7 +2473,7 @@
 "Linuksa&rdquo;, lecz&nbsp;jako wypaczone, rozcieńczone domieszkami wersje "
 "GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is very useful to start GNU/Linux User Groups, which call the system GNU/"
 "Linux and adopt the ideals of the GNU Project as a basis for their "
@@ -2421,7 +2492,7 @@
 "na&nbsp;powierzchownych celach, mają prawo do&nbsp;swoich poglądów, 
ale&nbsp;"
 "nie pozwólcie im, by was w&nbsp;to wciągali."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not make a GNU distribution of Linux (sic) and call that GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
@@ -2431,7 +2502,7 @@
 "nazwać ją GNU/Linux? <span class=\"anchor-reference-id\">(<a 
href=\"#gnudist"
 "\">#gnudist</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "All the &ldquo;Linux&rdquo; distributions are actually versions of the GNU "
 "system with Linux as the kernel.  The purpose of the term &ldquo;GNU/"
@@ -2445,7 +2516,7 @@
 "dystrybucji i&nbsp;nazwanie tylko jej &bdquo;GNU/Linux&rdquo; zaciemniłoby "
 "nasz cel, do&nbsp;którego dążymy."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "As for developing a distribution of GNU/Linux, we already did this once, "
 "when we funded the early development of Debian GNU/Linux.  To do it again "
@@ -2460,7 +2531,7 @@
 "miałaby w&nbsp;porównaniu z&nbsp;innymi dystrybucjami dużą przewagę o "
 "znaczeniu praktycznym."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Instead we help the developers of 100% free GNU/Linux distributions, such as "
 "gNewSense and Ututo."
@@ -2468,7 +2539,7 @@
 "W&nbsp;zamian za&nbsp;to pomagamy deweloperom 100% wolnych dystrybucji GNU/"
 "Linuksa, takich jak gNewSense i&nbsp;Ututo."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not just say &ldquo;Linux is the GNU kernel&rdquo; and release some "
 "existing version of GNU/Linux under the name &ldquo;GNU&rdquo;? <span class="
@@ -2479,7 +2550,7 @@
 "&bdquo;GNU&rdquo;? <span class=\"anchor-reference-id\">(<a href=\"#linuxgnu"
 "\">#linuxgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It might have been a good idea to adopt Linux as the GNU kernel back in "
 "1992.  If we had realized, then, how long it would take to get the GNU Hurd "
@@ -2490,7 +2561,7 @@
 "działającego systemu GNU Hurd, moglibyśmy to zrobić. (Niestety, to już "
 "wiedza po&nbsp;fakcie)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we were to take an existing version of GNU/Linux and relabel it as &ldquo;"
 "GNU&rdquo;, that would be somewhat like making a version of the GNU system "
@@ -2502,7 +2573,7 @@
 "i&nbsp;przemianowania go na&nbsp;&bdquo;Linuksa&rdquo; To nie byłoby w&nbsp;"
 "porządku i&nbsp;nie chcemy robić takich rzeczy."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Did the GNU Project condemn and oppose use of Linux in the early days? <span "
 "class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
@@ -2511,7 +2582,7 @@
 "nazwy Linux? <span class=\"anchor-reference-id\">(<a href=\"#condemn"
 "\">#condemn</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We did not adopt Linux as our kernel, but we didn't condemn or oppose it.  "
 "In 1993 we started discussing the arrangements to sponsor the development of "
@@ -2531,7 +2602,7 @@
 "te zmiany były często nieprzenośne i&nbsp;robione ad-hoc. Musiały być "
 "uporządkowane przed ich dołączeniem."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who had made the changes showed little interest in cooperating "
 "with us.  One of them actually told us that he didn't care about working "
@@ -2551,7 +2622,7 @@
 "na&nbsp;GNU, byli pierwszą (i do&nbsp;dziś praktycznie jedyną) grupą, 
która "
 "nie chciała z&nbsp;nami współpracować."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It was this experience that first showed us that people were calling a "
 "version of the GNU system &ldquo;Linux&rdquo;, and that this confusion was "
@@ -2565,7 +2636,7 @@
 "jest naszą odpowiedzią na&nbsp;ten problem i&nbsp;na inne problemy 
wywołane "
 "błędnym użyciem nazwy &bdquo;Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why did you wait so long before asking people to use the name GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
@@ -2574,7 +2645,7 @@
 "GNU/Linux? <span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually we didn't.  We began talking privately with developers and "
 "distributors about this in 1994, and made a more public campaign in 1996.  "
@@ -2585,7 +2656,7 @@
 "przeprowadziliśmy bardziej publiczną kampanię w&nbsp;roku 1996. Będziemy "
 "kontynuować tak długo, jak to będzie konieczne."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should the GNU/<i>name</i> convention be applied to all programs that are "
 "GPL'ed? <span class=\"anchor-reference-id\">(<a href=\"#allgpled"
@@ -2595,7 +2666,7 @@
 "programów udostępnianych na&nbsp;licencji GPL? <span class=\"anchor-"
 "reference-id\">(<a href=\"#allgpled\">#allgpled</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We never refer to individual programs as &ldquo;GNU/<i>name</i>&rdquo;.  "
 "When a program is a GNU package, we may call it &ldquo;GNU <i>name</"
@@ -2605,7 +2676,7 @@
 "i>&rdquo;. Jeśli program jest pakietem GNU, możemy nazywać go &bdquo;GNU "
 "<i>nazwa</i>&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU, the operating system, is made up of many different programs.  Some of "
 "the programs in GNU were written as part of the GNU Project or specifically "
@@ -2617,7 +2688,7 @@
 "część Projektu GNU lub&nbsp;stworzone specjalnie dla niego przez innych. 
To "
 "są pakiety GNU i&nbsp;często umieszczamy &bdquo;GNU&rdquo; w&nbsp;ich 
nazwie."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It's up to the developers of a program to decide if they want to contribute "
 "it and make it a GNU package.  If you have developed a program and you would "
@@ -2631,7 +2702,7 @@
 "gnu@gnu.org&gt;</a>, abyśmy mogli ocenić Wasz program i&nbsp;zdecydować, "
 "czy&nbsp;jest on dla nas użyteczny."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It wouldn't be fair to put the name GNU on every individual program that is "
 "released under the GPL.  If you write a program and release it under the "
@@ -2653,7 +2724,7 @@
 "sobie za&nbsp;to zasługi i&nbsp;umieszczanie &bdquo;GNU&rdquo; w&nbsp;nazwie 
"
 "programu byłoby niewłaściwe."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In contrast, we do deserve the overall credit for the GNU operating system "
 "as a whole, even though not for each and every program in it.  The system "
@@ -2666,7 +2737,7 @@
 "determinacji i&nbsp;wytrwałości. Powstał w&nbsp;roku 1984, na&nbsp;lata "
 "przed początkami Linuksa."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The operating system in which Linux became popular was basically the same as "
 "the GNU operating system.  It was not entirely the same, because it had a "
@@ -2678,7 +2749,7 @@
 "ponieważ&nbsp;miał inne jądro, ale&nbsp;był prawie tym samym systemem. 
Był "
 "wariantem GNU. Był systemem GNU/Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux continues to be used primarily in derivatives of that system&mdash;in "
 "today's versions of the GNU/Linux system.  What gives these systems their "
@@ -2690,7 +2761,7 @@
 "ich tożsamości, to GNU i&nbsp;Linux jako część centralna, a&nbsp;nie sam 
"
 "Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since much of GNU comes from Unix, shouldn't GNU give credit to Unix by "
 "using &ldquo;Unix&rdquo; in its name? <span class=\"anchor-reference-id\">"
@@ -2701,7 +2772,7 @@
 "nazwie? <span class=\"anchor-reference-id\">(<a href=\"#unix\">#unix</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Actually, none of GNU comes from Unix.  Unix was proprietary software (and "
 "still is), so using any of its code in GNU would have been illegal.  This is "
@@ -2719,7 +2790,7 @@
 "skopiować z&nbsp;Uniksa programów ani&nbsp;nawet ich części. Wszystko "
 "musiało być napisane od&nbsp;nowa."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "No code in GNU comes from Unix, but GNU is a Unix-compatible system; "
 "therefore, many of the ideas and specifications of GNU do come from Unix.  "
@@ -2734,13 +2805,29 @@
 "wynikającym z&nbsp;hakerskiej tradycji rekursywnych akronimów, sięgającej 
"
 "lat 70."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.
+# |  The author of TINT wrote another implementation of TECO (there were
+# | already many of them, for various systems), but instead of calling it by a
+# | dull name like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of
+# | a clever amusing name.  (That's what hacking means: <a
+# | href=\"http{+s+}://stallman.org/articles/on-hacking.html\">playful
+# | cleverness</a>.)
+#, fuzzy
+#| msgid ""
+#| "The first such recursive acronym was TINT, &ldquo;TINT Is Not "
+#| "TECO&rdquo;.  The author of TINT wrote another implementation of TECO "
+#| "(there were already many of them, for various systems), but instead of "
+#| "calling it by a dull name like &ldquo;<em>somethingorother</em> "
+#| "TECO&rdquo;, he thought of a clever amusing name.  (That's what hacking "
+#| "means: <a href=\"http://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
 "The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
 "The author of TINT wrote another implementation of TECO (there were already "
 "many of them, for various systems), but instead of calling it by a dull name "
 "like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of a clever "
-"amusing name.  (That's what hacking means: <a href=\"http://stallman.org/";
+"amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
 "Pierwszym takim rekursywnym akronimem był TINT, &bdquo;TINT Is Not "
@@ -2751,7 +2838,7 @@
 "\"http://stallman.org/articles/on-hacking.html\";>pomysłowość i&nbsp;dobra "
 "zabawa</a>)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Other hackers enjoyed that name so much that we imitated the approach.  It "
 "became a tradition that, when you were writing from scratch a program that "
@@ -2769,7 +2856,7 @@
 "tej samej zasady nazwaliśmy naszego zastępcę Uniksa &bdquo;GNU's Not "
 "Unix&rdquo; (&bdquo;GNU to Nie Unix&rdquo;)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Historically, AT&amp;T which developed Unix did not want anyone to give it "
 "credit by using &ldquo;Unix&rdquo; in the name of a similar system, not even "
@@ -2789,7 +2876,7 @@
 "zastrzeżonych), wyprodukowanych przez różne firmy komputerowe, miała jaką
ś "
 "inną nazwę."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we say &ldquo;GNU/BSD&rdquo; too? <span class=\"anchor-reference-id\">"
 "(<a href=\"#bsd\">#bsd</a>)</span>"
@@ -2797,7 +2884,7 @@
 "Czy&nbsp;powinniśmy również mówić &bdquo;GNU/BSD&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems, "
 "because that term does not fit the history of the BSD systems."
@@ -2805,9 +2892,19 @@
 "Nie nazywamy systemów BSD (FreeBSD itd.) systemami &bdquo;GNU/BSD&rdquo;, "
 "ponieważ&nbsp;to określenie nie pasuje do&nbsp;historii systemów BSD."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The BSD system was developed by UC Berkeley as non[---]free software in
+# | the 80s, and became free in the early 90s.  A free operating system that
+# | exists today is almost certainly either a variant of the GNU system, or a
+# | kind of BSD system.
+#, fuzzy
+#| msgid ""
+#| "The BSD system was developed by UC Berkeley as non-free software in the "
+#| "80s, and became free in the early 90s.  A free operating system that "
+#| "exists today is almost certainly either a variant of the GNU system, or a "
+#| "kind of BSD system."
 msgid ""
-"The BSD system was developed by UC Berkeley as non-free software in the 80s, "
+"The BSD system was developed by UC Berkeley as nonfree software in the 80s, "
 "and became free in the early 90s.  A free operating system that exists today "
 "is almost certainly either a variant of the GNU system, or a kind of BSD "
 "system."
@@ -2818,7 +2915,7 @@
 "operacyjny to prawie na&nbsp;pewno wariant systemu GNU lub&nbsp;odmiana "
 "systemu BSD."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "People sometimes ask whether BSD too is a variant of GNU, as GNU/Linux is.  "
 "It is not.  The BSD developers were inspired to make their code free "
@@ -2832,7 +2929,7 @@
 "apele ze strony aktywistów GNU pomogły przekonać ich do&nbsp;rozpoczęcia "
 "tego procesu, lecz&nbsp;ich kod ma mało wspólnego z&nbsp;kodem GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "BSD systems today use some GNU packages, just as the GNU system and its "
 "variants use some BSD programs; however, taken as wholes, they are two "
@@ -2846,7 +2943,7 @@
 "jądra i&nbsp;nie dodali go do&nbsp;systemu GNU, więc&nbsp;nazwa GNU/BSD nie 
"
 "pasuje do&nbsp;tej sytuacji."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The connection between GNU/Linux and GNU is much closer, and that's why the "
 "name &ldquo;GNU/Linux&rdquo; is appropriate for it."
@@ -2854,7 +2951,7 @@
 "Związek między systemem GNU/Linux i&nbsp;GNU jest o wiele bliższy i&nbsp;"
 "dlatego nazwa &bdquo;GNU/Linux&rdquo; jest dla niego właściwa."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is a version of GNU which uses the kernel from NetBSD.  Its developers "
 "call it &ldquo;Debian GNU/NetBSD&rdquo;, but &ldquo;GNU/"
@@ -2868,7 +2965,7 @@
 "cały system a&nbsp;nie tylko jądro. Nie jest to system BSD, ponieważ&nbsp;"
 "większość tego systemu jest taka jak system GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "If I install the GNU tools on Windows, does that mean I am running a GNU/"
 "Windows system? <span class=\"anchor-reference-id\">(<a href=\"#othersys"
@@ -2878,7 +2975,7 @@
 "oznacza, że&nbsp;pracuję w&nbsp;systemie GNU/Windows? <span class=\"anchor-"
 "reference-id\">(<a href=\"#othersys\">#othersys</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
 "GNU are just a part of the GNU software, which is just a part of the GNU "
@@ -2893,7 +2990,7 @@
 "[źródłowego]. Podsumowując, sytuacja jest zupełnie inna niż 
w&nbsp;przypadku "
 "GNU/Linuksa."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can't Linux be used without GNU? <span class=\"anchor-reference-id\">(<a "
 "href=\"#justlinux\">#justlinux</a>)</span>"
@@ -2901,7 +2998,7 @@
 "Czy&nbsp;Linux nie może być używany bez&nbsp;GNU? <span class=\"anchor-"
 "reference-id\">(<a href=\"#justlinux\">#justlinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is used by itself, or with small other programs, in some appliances.  "
 "These small software systems are a far cry from the GNU/Linux system.  Users "
@@ -2916,7 +3013,7 @@
 "Można powiedzieć, że&nbsp;te małe urządzenia uruchamiają tylko Linuksa 
by "
 "pokazać, jak różne są od&nbsp;GNU/Linuksa."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How much of the GNU system is needed for the system to be GNU/Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
@@ -2924,7 +3021,7 @@
 "Ile musi być systemu GNU aby&nbsp;system się nazywał GNU/Linux? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "&ldquo;How much&rdquo; is not a meaningful question because the GNU system "
 "does not have precise boundaries."
@@ -2932,7 +3029,7 @@
 "&bdquo;Ile&rdquo; nie jest dobrym pytaniem, ponieważ&nbsp;system GNU nie ma "
 "jasnych granic."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is an operating system maintained by a community.  It includes far more "
 "than just the GNU software packages (of which we have a specific list), and "
@@ -2948,7 +3045,7 @@
 "Jeśli używacie część systemu GNU, a&nbsp;część ominiecie, nie ma jak "
 "policzyć &bdquo;ile&rdquo; użyliście."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we look at the level of packages, Linux is one important package in the "
 "GNU/Linux system.  The inclusion of one important GNU package is enough to "
@@ -2958,7 +3055,7 @@
 "pakietów systemu GNU/Linux. Załączanie jednego ważnego pakietu GNU to 
już "
 "wystarczająco aby&nbsp;uzasadnić naszą prośbę o równe wspominanie."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Are there complete Linux systems [sic] without GNU? <span class=\"anchor-"
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
@@ -2968,7 +3065,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#linuxsyswithoutgnu"
 "\">#linuxsyswithoutgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There are complete systems that contain Linux and not GNU; Android is an "
 "example.  But it is a mistake to call them &ldquo;Linux&rdquo; systems, just "
@@ -2979,7 +3076,7 @@
 "Linux&rdquo; jest nieporozumieniem, tak jak jest nieporozumieniem nazywanie "
 "GNU systemem &bdquo;Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android is very different from the GNU/Linux system&mdash;because the two "
 "have very little code in common.  In fact, the only thing they have in "
@@ -2989,7 +3086,7 @@
 "ponieważ&nbsp;mają bardzo mało wspólnego kodu źródłowego. 
W&nbsp;zasadzie, "
 "jedynym wspólnym elementem jest Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
 "necessary to say things like, &ldquo;Android contains Linux, but it isn't "
@@ -3001,7 +3098,7 @@
 "Linuksa, ale&nbsp;to nie jest Linux, ponieważ&nbsp;nie posiada zwykłych "
 "Linuksowych [sic] bibliotek oraz&nbsp;narzędzi [chodzi o system GNU].&rdquo;"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android contains just as much of Linux as GNU/Linux does.  What it doesn't "
 "have is the GNU system.  Android replaces that with Google software that "
@@ -3012,7 +3109,7 @@
 "systemu GNU. Android zastępuje go na&nbsp;oprogramowanie Google, które "
 "działa odmiennie. Co rozróżnia Android od&nbsp;GNU/Linux jest brak GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Is it correct to say &ldquo;using Linux&rdquo; if it refers to using GNU/"
 "Linux and using Android? <span class=\"anchor-reference-id\">(<a href="
@@ -3020,27 +3117,27 @@
 "\">#usegnulinuxandandroidlinuxsyswithoutgnu</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Far from it.  That usage is so strained that people will not understand the "
 "intended meaning."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public will find it very strange to speak of using Android as &ldquo;"
 "using Linux&rdquo;.  It's like having a conversation, then saying you were "
 "conversing with the person's intestines or the person's circulatory system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public <em>will</em> understand the idea of &ldquo;using Linux&rdquo; "
 "when it's really GNU/Linux, by way of the usual misunderstanding: thinking "
 "of the whole system as &ldquo;Linux&rdquo;."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Use of Android and use of GNU/Linux are totally different, as different as "
 "driving a car and riding a bicycle.  The fact that the first two both "
@@ -3053,7 +3150,7 @@
 "GNU/Linux and Android.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not call the system &ldquo;Linux&rdquo; anyway, and strengthen Linus "
 "Torvalds' role as posterboy for our community? <span class=\"anchor-"
@@ -3063,7 +3160,7 @@
 "w&nbsp;ten sposób roli Linusa Torvaldsa jako gwiazdy naszej wspólnoty? 
<span "
 "class=\"anchor-reference-id\">(<a href=\"#helplinus\">#helplinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Linus Torvalds is the &ldquo;posterboy&rdquo; (other people's choice of "
 "word, not ours) for his goals, not ours.  His goal is to make the system "
@@ -3081,12 +3178,30 @@
 "\"/philosophy/why-free.html\">wolności współpracy</a> jako zasady 
etycznej, "
 "i&nbsp;dlatego ludzie nie łączą nazwy &bdquo;Linux&rdquo; z&nbsp;tą 
zasadą."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | Linus publicly states his disagreement with the free software movement's
+# | ideals.  He developed non[---]free software in his job for many years (and
+# | said so to a large audience at a &ldquo;Linux&rdquo;World show), and
+# | publicly invited fellow developers of Linux, the kernel, to use
+# | non[---]free software to work on it with him.  He goes even further, and
+# | rebukes people who suggest that engineers and scientists should consider
+# | social consequences of our technical work&mdash;rejecting the lessons
+# | society learned from the development of the atom bomb.
+#, fuzzy
+#| msgid ""
+#| "Linus publicly states his disagreement with the free software movement's "
+#| "ideals.  He developed non-free software in his job for many years (and "
+#| "said so to a large audience at a &ldquo;Linux&rdquo;World show), and "
+#| "publicly invited fellow developers of Linux, the kernel, to use non-free "
+#| "software to work on it with him.  He goes even further, and rebukes "
+#| "people who suggest that engineers and scientists should consider social "
+#| "consequences of our technical work&mdash;rejecting the lessons society "
+#| "learned from the development of the atom bomb."
 msgid ""
 "Linus publicly states his disagreement with the free software movement's "
-"ideals.  He developed non-free software in his job for many years (and said "
+"ideals.  He developed nonfree software in his job for many years (and said "
 "so to a large audience at a &ldquo;Linux&rdquo;World show), and publicly "
-"invited fellow developers of Linux, the kernel, to use non-free software to "
+"invited fellow developers of Linux, the kernel, to use nonfree software to "
 "work on it with him.  He goes even further, and rebukes people who suggest "
 "that engineers and scientists should consider social consequences of our "
 "technical work&mdash;rejecting the lessons society learned from the "
@@ -3102,7 +3217,7 @@
 "swojej pracy. Odrzuca w&nbsp;ten sposób lekcję, której społeczeństwo "
 "nauczyło się po&nbsp;skonstruowaniu bomby atomowej."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with writing a free program for the motivations of "
 "learning and having fun; the kernel Linus wrote for those reasons was an "
@@ -3122,7 +3237,7 @@
 "mieć świadomość, że&nbsp;system operacyjny, o którym mowa, wywodzi się 
"
 "z&nbsp;ideałów wolności, a&nbsp;nie z&nbsp;jego poglądów."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong for us to label Linus Torvalds' work as GNU? <span class="
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
@@ -3131,7 +3246,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong, so we don't do that.  Torvalds' work is Linux, the "
 "kernel; we are careful not to attribute that work to the GNU Project or "
@@ -3144,7 +3259,7 @@
 "mówimy o całym systemie, nazwa &bdquo;GNU/Linux&rdquo; oddaje mu należną "
 "część."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Does Linus Torvalds agree that Linux is just the kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
@@ -3153,10 +3268,23 @@
 "tylko jądro? <span class=\"anchor-reference-id\">(<a href=\"#linusagreed"
 "\">#linusagreed</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | He recognized this at the beginning.  The earliest Linux release notes
+# | said, <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | &ldquo;Most of the tools used with linux are GNU software and are under
+# | the GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
+# |  for more info&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
+#| "versions/RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are "
+#| "GNU software and are under the GNU copyleft. These tools aren't in the "
+#| "distribution - ask me (or GNU)  for more info&rdquo;</a>."
 msgid ""
 "He recognized this at the beginning.  The earliest Linux release notes said, "
-"<a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"<a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
 "RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are GNU software "
 "and are under the GNU copyleft. These tools aren't in the distribution - ask "
 "me (or GNU)  for more info&rdquo;</a>."
@@ -3168,7 +3296,7 @@
 "na&nbsp;licencji GNU copyleft. Te narzędzia nie są w&nbsp;dystrybucji&nbsp;"
 "&ndash; aby&nbsp;dowiedzieć się więcej, zapytaj mnie (albo 
GNU)&rdquo;</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not finish the GNU Hurd kernel, release the GNU system as a whole, and "
 "forget the question of what to call GNU/Linux? <span class=\"anchor-"
@@ -3178,7 +3306,7 @@
 "i&nbsp;zapomnieć o tym jak nazywać GNU/Linux? <span 
class=\"anchor-reference-"
 "id\">(<a href=\"#finishhurd\">#finishhurd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We would like credit for the GNU operating system no matter which kernel is "
 "used with it."
@@ -3186,13 +3314,27 @@
 "Chcielibyśmy uznanie za&nbsp;system operacyjny GNU niezależnie od&nbsp;ją
dra "
 "z&nbsp;którym pracuje."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | Making the GNU Hurd work well enough to compete with Linux would be a big
+# | job, and it's not clearly necessary.  The only thing ethically wrong with
+# | Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the
+# | best fix for that problem is <a
+# | [-href=\"http://fsf.org/campaigns/priority-projects\";>-]
+# | {+href=\"https://www.fsf.org/campaigns/priority-projects\";>+} developing
+# | free replacement for the blobs</a>.
+#, fuzzy
+#| msgid ""
+#| "Making the GNU Hurd work well enough to compete with Linux would be a big "
+#| "job, and it's not clearly necessary.  The only thing ethically wrong with "
+#| "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the "
+#| "best fix for that problem is <a href=\"http://fsf.org/campaigns/priority-";
+#| "projects\"> developing free replacement for the blobs</a>."
 msgid ""
 "Making the GNU Hurd work well enough to compete with Linux would be a big "
 "job, and it's not clearly necessary.  The only thing ethically wrong with "
 "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the best "
-"fix for that problem is <a href=\"http://fsf.org/campaigns/priority-projects";
-"\"> developing free replacement for the blobs</a>."
+"fix for that problem is <a href=\"https://www.fsf.org/campaigns/priority-";
+"projects\"> developing free replacement for the blobs</a>."
 msgstr ""
 "Doprowadzenie GNU Hurd do&nbsp;takiego stopnia aby&nbsp;konkurował z&nbsp;"
 "Linuksem byłoby sporym przedsięwzięciem i&nbsp;nie jest konieczne. Jedyną 
"
@@ -3201,7 +3343,7 @@
 "\"http://fsf.org/campaigns/priority-projects\";>rozwijaniem wolnych "
 "zamienników tych blobów</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The battle is already lost&mdash;society has made its decision and we can't "
 "change it, so why even think about it? <span class=\"anchor-reference-id\">"
@@ -3211,7 +3353,7 @@
 "nie możemy tego zmienić, więc&nbsp;po co jeszcze o tym myśleć? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#lost\">#lost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This isn't a battle, it is a campaign of education.  What to call the system "
 "is not a single decision, to be made at one moment by &ldquo;society&rdquo;: "
@@ -3227,7 +3369,7 @@
 "Linux&rdquo;, ale&nbsp;możecie sami zdecydować się na&nbsp;nazywanie 
systemu "
 "&bdquo;GNU/Linux&rdquo;. Robiąc tak pomożecie nam."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Society has made its decision and we can't change it, so what good does it "
 "do if I say &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id\">(<a "
@@ -3237,7 +3379,7 @@
 "to da, że&nbsp;ja będę mówić &bdquo;GNU/Linux&rdquo;? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#whatgood\">#whatgood</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is not an all-or-nothing situation: correct and incorrect pictures are "
 "being spread more or less by various people.  If you call the system &ldquo;"
@@ -3259,7 +3401,7 @@
 "nakładzie pracy. Niektórzy z&nbsp;nich powiedzą innym ludziom o poprawnej "
 "nazwie."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to call the system &ldquo;Linux&rdquo; and teach "
 "people its real origin with a ten-minute explanation? <span class=\"anchor-"
@@ -3269,7 +3411,7 @@
 "jego pochodzeniu w&nbsp;krótkim omówieniu? <span 
class=\"anchor-reference-id"
 "\">(<a href=\"#explain\">#explain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "If you help us by explaining to others in that way, we appreciate your "
 "effort, but that is not the best method.  It is not as effective as calling "
@@ -3280,7 +3422,7 @@
 "jest tak efektywna jak nazywanie systemu &bdquo;GNU/Linux&rdquo; i&nbsp;nie "
 "jest wydajna pod&nbsp;względem czasowym."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is ineffective because it may not sink in, and surely will not "
 "propagate.  Some of the people who hear your explanation will pay attention, "
@@ -3298,7 +3440,7 @@
 "&bdquo;Linux&rdquo; i&nbsp;niechcący będą dalej rozprzestrzeniać 
niepoprawne "
 "informacje."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is inefficient because it takes a lot more time.  Saying and writing "
 "&ldquo;GNU/Linux&rdquo; will take you only a few seconds a day, not minutes, "
@@ -3313,7 +3455,7 @@
 "GNU/Linuksem kiedy piszecie i&nbsp;mówicie jest niewątpliwie 
najłatwiejszym "
 "sposobem efektywnego pomagania Projektowi GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people laugh at you when you ask them to call the system GNU/Linux.  "
 "Why do you subject yourself to this treatment? <span class=\"anchor-"
@@ -3323,7 +3465,7 @@
 "systemu: GNU/Linux. Czemu narażacie się na&nbsp;takie traktowanie? <span "
 "class=\"anchor-reference-id\">(<a href=\"#treatment\">#treatment</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; tends to give people a mistaken "
 "picture of the system's history and reason for existence.  People who laugh "
@@ -3338,7 +3480,7 @@
 "Śmieją się więc&nbsp;z nas kiedy mówimy, że&nbsp;to nasza zasługa. 
Gdyby "
 "znali prawdę, prawdopodobnie nie śmialiby się."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Why do we take the risk of making a request that sometimes leads people to "
 "ridicule us? Because often it has useful results that help the GNU Project.  "
@@ -3349,7 +3491,7 @@
 "Projektowi GNU. Aby&nbsp;osiągnąć nasz cel będziemy podejmować ryzyko "
 "niezasłużonych obelg."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you see such an ironically unfair situation occurring, please don't sit "
 "idly by.  Please teach the laughing people the real history.  When they see "
@@ -3361,7 +3503,7 @@
 "usprawiedliwione, ci z&nbsp;nich, którzy mają choć&nbsp;trochę rozsądku, 
"
 "przestaną się śmiać."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people condemn you when you ask them to call the system GNU/Linux.  "
 "Don't you lose by alienating them? <span class=\"anchor-reference-id\">(<a "
@@ -3371,7 +3513,7 @@
 "Linux. Czy&nbsp;nie tracicie na&nbsp;tym, że&nbsp;ich zrażacie? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#alienate\">#alienate</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not much.  People who don't appreciate our role in developing the system are "
 "unlikely to make substantial efforts to help us.  If they do work that "
@@ -3388,7 +3530,7 @@
 "Równocześnie poprzez&nbsp;pokazywanie ludziom, że&nbsp;naszą pracę 
wykonał "
 "ktoś inny, podważają naszą możliwość pozyskania pomocy innych ludzi."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It makes no sense to worry about alienating people who are already mostly "
 "uncooperative, and it is self-defeating to be deterred from correcting a "
@@ -3401,7 +3543,7 @@
 "moglibyśmy rozgniewać tym ludzi, którzy ten błąd utrwalają. 
Dlatego&nbsp;"
 "nadal będziemy próbowali poprawiać błędne używanie nazwy."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Whatever you contributed, is it legitimate to rename the operating system? "
 "<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
@@ -3410,7 +3552,7 @@
 "systemu operacyjnego? <span class=\"anchor-reference-id\">(<a href=\"#rename"
 "\">#rename</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are not renaming anything; we have been calling this system &ldquo;"
 "GNU&rdquo; ever since we announced it in 1983.  The people who tried to "
@@ -3420,7 +3562,7 @@
 "od&nbsp;początku jego tworzenia w&nbsp;roku 1983. Ludzie, którzy próbowali 
"
 "przemianować go na&nbsp;&bdquo;Linux&rdquo;, nie powinni byli tego robić."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong to force people to call the system &ldquo;GNU/Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
@@ -3429,7 +3571,7 @@
 "Linuksem&rdquo;? <span class=\"anchor-reference-id\">(<a href=\"#force"
 "\">#force</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong to force them, and we don't try.  We call the system "
 "&ldquo;GNU/Linux&rdquo;, and we ask you to do it too."
@@ -3438,7 +3580,7 @@
 "Linux&rdquo; na&nbsp;system i&nbsp;[jedynie] prosimy Was o czynienie tego "
 "samego."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not sue people who call the whole system &ldquo;Linux&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
@@ -3447,7 +3589,7 @@
 "Linux&rdquo;? <span class=\"anchor-reference-id\">(<a href=\"#whynotsue"
 "\">#whynotsue</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are no legal grounds to sue them, but since we believe in freedom of "
 "speech, we wouldn't want to do that anyway.  We ask people to call the "
@@ -3458,7 +3600,7 @@
 "tak czy&nbsp;owak. Prosimy ludzi o nazywanie systemu &bdquo;GNU/"
 "Linux&rdquo;, ponieważ&nbsp;tak należy robić."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Shouldn't you put something in the GNU GPL to require people to call the "
 "system &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id\">(<a href="
@@ -3468,13 +3610,31 @@
 "który wymagałby nazywania systemu &bdquo;GNU&rdquo;? <span class=\"anchor-"
 "reference-id\">(<a href=\"#require\">#require</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
+# | The purpose of the GNU GPL is to protect the users' freedom from those who
+# | would make proprietary versions of free software.  While it is true that
+# | those who call the system &ldquo;Linux&rdquo; often do things that limit
+# | the users' freedom, such as bundling non[---]free software with the
+# | GNU/Linux system or even developing non[---]free software for such use,
+# | the mere act of calling the system &ldquo;Linux&rdquo; does not, in
+# | itself, deny users their freedom.  It seems improper to make the GPL
+# | restrict what name people can use for the system.
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU GPL is to protect the users' freedom from those "
+#| "who would make proprietary versions of free software.  While it is true "
+#| "that those who call the system &ldquo;Linux&rdquo; often do things that "
+#| "limit the users' freedom, such as bundling non-free software with the GNU/"
+#| "Linux system or even developing non-free software for such use, the mere "
+#| "act of calling the system &ldquo;Linux&rdquo; does not, in itself, deny "
+#| "users their freedom.  It seems improper to make the GPL restrict what "
+#| "name people can use for the system."
 msgid ""
 "The purpose of the GNU GPL is to protect the users' freedom from those who "
 "would make proprietary versions of free software.  While it is true that "
 "those who call the system &ldquo;Linux&rdquo; often do things that limit the "
-"users' freedom, such as bundling non-free software with the GNU/Linux system "
-"or even developing non-free software for such use, the mere act of calling "
+"users' freedom, such as bundling nonfree software with the GNU/Linux system "
+"or even developing nonfree software for such use, the mere act of calling "
 "the system &ldquo;Linux&rdquo; does not, in itself, deny users their "
 "freedom.  It seems improper to make the GPL restrict what name people can "
 "use for the system."
@@ -3490,7 +3650,7 @@
 "wolności. Wydaje się niewłaściwe używanie licencji GPL 
do&nbsp;narzucania "
 "tego, jakimi nazwami użytkownicy mogą nazywać system."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you objected to the original BSD license's advertising requirement to "
 "give credit to the University of California, isn't it hypocritical to demand "
@@ -3502,7 +3662,7 @@
 "żądanie uznania dla Projektu GNU? <span class=\"anchor-reference-id\">(<a "
 "href=\"#BSDlicense\">#BSDlicense</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would be hypocritical to make the name GNU/Linux a license requirement, "
 "and we don't.  We only <em>ask</em> you to give us the credit we deserve."
@@ -3511,7 +3671,7 @@
 "nie robimy. My tylko <em>prosimy</em> Was o uznanie, na&nbsp;które "
 "zasługujemy."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please note that there are at least <a href=\"/licenses/bsd.html\"> two "
 "different BSD licenses</a>.  For clarity's sake, please don't use the term "
@@ -3521,7 +3681,7 @@
 "licenses/bsd.html\">dwie różne licencje BSD</a>. Dla jasności, nie 
używajcie "
 "terminu &bdquo;licencja BSD&rdquo; bez&nbsp;wymieniana o którą chodzi."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you failed to put something in the GNU GPL to require people to call "
 "the system &ldquo;GNU&rdquo;, you deserve what happened; why are you "
@@ -3533,7 +3693,7 @@
 "obecną sytuację. Czemu się teraz skarżycie? <span 
class=\"anchor-reference-id"
 "\">(<a href=\"#deserve\">#deserve</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The question presupposes a rather controversial general ethical premise: "
 "that if people do not force you to treat them fairly, you are entitled to "
@@ -3545,12 +3705,12 @@
 "jesteście upoważnieni do&nbsp;wykorzystania ich tak jak chcecie. Innymi "
 "słowy zakłada, że&nbsp;siła stanowi o słuszności."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope you disagree with that premise just as we do."
 msgstr ""
 "Mamy nadzieję, że&nbsp;tak jak my nie zgadzacie się z&nbsp;tym 
założeniem."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't you be better off not contradicting what so many people believe? "
 "<span class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)"
@@ -3560,7 +3720,7 @@
 "temu, w&nbsp;co wierzy tylu ludzi? <span class=\"anchor-reference-id\">(<a "
 "href=\"#contradict\">#contradict</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't think we should go along with large numbers of people because they "
 "have been misled.  We hope you too will decide that truth is important."
@@ -3569,7 +3729,7 @@
 "zostali wprowadzeni w&nbsp;błąd. Mamy nadzieję, że&nbsp;Wy też 
dojdziecie "
 "do&nbsp;wniosku, że&nbsp;prawda jest ważna."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We could never have developed a free operating system without first denying "
 "the belief, held by most people, that proprietary software was legitimate "
@@ -3579,7 +3739,7 @@
 "wcześniej nie zaprzeczyli przekonaniu podzielanemu przez większość ludzi, 
"
 "że&nbsp;oprogramowanie prawnie zastrzeżone jest właściwe 
i&nbsp;akceptowalne."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
 "<span class=\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</"
@@ -3589,11 +3749,11 @@
 "to, że&nbsp;to określenie jest poprawne? <span 
class=\"anchor-reference-id\">"
 "(<a href=\"#somanyright\">#somanyright</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "We don't think that the popularity of an error makes it the truth."
 msgstr "Nie uważamy, że&nbsp;popularność błędu czyni go prawdą."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it better to call the system by the name most users already know? "
 "<span class=\"anchor-reference-id\">(<a href=\"#knownname\">#knownname</a>)</"
@@ -3603,7 +3763,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#knownname\">#knownname</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo; includes "
 "&ldquo;Linux&rdquo;, they will recognize what you're talking about.  If you "
@@ -3615,7 +3775,7 @@
 "czasami dodacie &bdquo;(często mylnie nazywanym &sbquo;Linux&rsquo;)&rdquo;, 
"
 "wszyscy zrozumieją."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many people care about what's convenient or who's winning, not about "
 "arguments of right or wrong.  Couldn't you get more of their support by a "
@@ -3628,12 +3788,24 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#winning\">#winning</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+# | To care only about what's convenient or who's winning is an amoral
+# | approach to life.  Non[---]free software is an example of that amoral
+# | approach and thrives on it.  Thus, in the long run it would be
+# | self-defeating for us to adopt that approach.  We will continue talking in
+# | terms of right and wrong.
+#, fuzzy
+#| msgid ""
+#| "To care only about what's convenient or who's winning is an amoral "
+#| "approach to life.  Non-free software is an example of that amoral "
+#| "approach and thrives on it.  Thus, in the long run it would be self-"
+#| "defeating for us to adopt that approach.  We will continue talking in "
+#| "terms of right and wrong."
 msgid ""
 "To care only about what's convenient or who's winning is an amoral approach "
-"to life.  Non-free software is an example of that amoral approach and "
-"thrives on it.  Thus, in the long run it would be self-defeating for us to "
-"adopt that approach.  We will continue talking in terms of right and wrong."
+"to life.  Nonfree software is an example of that amoral approach and thrives "
+"on it.  Thus, in the long run it would be self-defeating for us to adopt "
+"that approach.  We will continue talking in terms of right and wrong."
 msgstr ""
 "Zwracanie uwagi tylko na&nbsp;to, co jest dogodne lub&nbsp;kto wygrywa, jest "
 "amoralnym podejściem do&nbsp;życia. Niewolne oprogramowanie jest 
przykładem "
@@ -3642,7 +3814,7 @@
 "byłoby więc&nbsp;doprowadzeniem się do&nbsp;przegranej. Będziemy dalej 
mówić "
 "posługując się kategoriami dobra i&nbsp;zła."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope that you are one of those for whom right and wrong do matter."
 msgstr ""
 "Mamy nadzieję, że&nbsp;należycie do&nbsp;ludzi, dla których liczy się "
@@ -3701,16 +3873,15 @@
 "tłumaczeń</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2001, [-2006, 2007, 2008,-] {+2006-2008,+} 2010, 2011,
-# | 2013, [-2014, 2015-] {+2014-2018, 2020, 2021+} Free Software Foundation,
-# | Inc.
+# | Copyright &copy; [-2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015-]
+# | {+2001-2011, 2013-2018, 2020, 2021+} Free Software Foundation, Inc.
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015 "
 #| "Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation, "
+"Inc."
 msgstr ""
 "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015 Free "
 "Software Foundation, Inc."

Index: gnu/po/gnu-linux-faq.pot
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.pot,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- gnu/po/gnu-linux-faq.pot    7 Apr 2021 18:03:55 -0000       1.56
+++ gnu/po/gnu-linux-faq.pot    30 Aug 2021 13:34:53 -0000      1.57
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,30 +20,25 @@
 msgid "GNU/Linux FAQ - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU/Linux FAQ"
 msgstr ""
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by Richard Stallman"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our page on <a "
-"href=\"/gnu/linux-and-gnu.html\">Linux and the GNU Project</a>, our page on "
-"<a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a "
-"href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
-"Heard of GNU</a>."
-msgstr ""
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When people see that we use and recommend the name GNU/Linux for a system "
 "that many others call just &ldquo;Linux&rdquo;, they ask many questions.  "
 "Here are common questions, and our answers."
 msgstr ""
 
+#. type: Content of: <div><div><h3>
+msgid "Table of Contents"
+msgstr ""
+
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<a href=\"#why\">Why do you call the system we use GNU/Linux and not "
@@ -486,13 +481,22 @@
 "their support by a different road?</a>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><div><p>
+msgid ""
+"To learn more about this issue, you can also read our page on <a "
+"href=\"/gnu/linux-and-gnu.html\">Linux and the GNU System</a>, our page on "
+"<a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a "
+"href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+"Heard of GNU</a>."
+msgstr ""
+
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you call the system we use GNU/Linux and not Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Most operating system distributions based on Linux as kernel are basically "
 "modified versions of the GNU operating system.  We began developing GNU in "
@@ -503,11 +507,11 @@
 "system.  The basic vision was ours too."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "In fairness, we ought to get at least equal mention."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and the GNU System</a> and <a "
 "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
@@ -515,13 +519,13 @@
 "href=\"/gnu/the-gnu-project.html\">The GNU Project</a> for the history."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why is the name important? <span class=\"anchor-reference-id\">(<a "
 "href=\"#whycare\">#whycare</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Although the developers of Linux, the kernel, are contributing to the free "
 "software community, many of them do not care about freedom.  People who "
@@ -530,20 +534,20 @@
 "actually play.  Then they give inordinate weight to those developers' views."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Calling the system GNU/Linux recognizes the role that our idealism played in "
 "building our community, and <a href=\"/gnu/why-gnu-linux.html\">helps the "
 "public recognize the practical importance of these ideals</a>."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the real relationship between GNU and Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#what\">#what</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU operating system and the Linux kernel are separate software projects "
 "that do complementary jobs.  Typically they are packaged in a <a "
@@ -551,20 +555,20 @@
 "together."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How did it come about that most people call the system &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a "
 "href=\"#howerror\">#howerror</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; is a confusion that has spread faster "
 "than the corrective information."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who combined Linux with the GNU system were not aware that that's "
 "what their activity amounted to.  They focused their attention on the piece "
@@ -575,7 +579,7 @@
 "confusion had a big head start."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the people who call the system &ldquo;Linux&rdquo; have never heard "
 "why that's not the right thing.  They saw others using that name and assume "
@@ -586,26 +590,26 @@
 "to reinforce the idea that the system should be called &ldquo;Linux&rdquo;."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Many of the questions in this file represent people's attempts to justify "
 "the name they are accustomed to using."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we always say &ldquo;GNU/Linux&rdquo; instead of &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not always&mdash;only when you're talking about the whole system.  When "
 "you're referring specifically to the kernel, you should call it "
 "&ldquo;Linux&rdquo;, the name its developer chose."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
 "call the whole system by the same name as the kernel.  This causes many "
@@ -615,14 +619,14 @@
 "avoid the ambiguity."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Would Linux have achieved the same success if there had been no GNU? <span "
 "class=\"anchor-reference-id\">(<a "
 "href=\"#linuxalone\">#linuxalone</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In that alternative world, there would be nothing today like the GNU/Linux "
 "system, and probably no free operating system at all.  No one attempted to "
@@ -631,7 +635,7 @@
 "to start freeing its code."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds was partly influenced by a speech about GNU in Finland in "
 "1990.  It's possible that even without this influence he might have written "
@@ -640,7 +644,7 @@
 "the release notes for version 0.12.)"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Even if Torvalds had released Linux under some other free software license, "
 "a free kernel alone would not have made much difference to the world.  The "
@@ -648,21 +652,21 @@
 "free operating system: GNU/Linux."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better for the community if you did not divide people with "
 "this request? <span class=\"anchor-reference-id\">(<a "
 "href=\"#divide\">#divide</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
 "people.  We are asking them to give the GNU Project credit for the GNU "
 "operating system.  This does not criticize anyone or push anyone away."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, there are people who do not like our saying this.  Sometimes those "
 "people push us away in response.  On occasion they are so rude that one "
@@ -671,7 +675,7 @@
 "can convince them to stop."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, this is only a secondary cause of division in our community.  The "
 "largest division in the community is between people who appreciate free "
@@ -681,7 +685,7 @@
 "development model (the open source movement)."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This disagreement is not just a matter of names&mdash;it is a matter of "
 "differing basic values.  It is essential for the community to see and think "
@@ -691,7 +695,7 @@
 "misses the point of Free Software</a>."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The disagreement over values partially aligns with the amount of attention "
 "people pay to the GNU Project's role in our community.  People who value "
@@ -705,7 +709,7 @@
 "everyone (which won't be easy) or are defeated entirely (let's hope not)."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Doesn't the GNU project support an individual's free speech rights to call "
 "the system by any name that individual chooses? <span "
@@ -713,7 +717,7 @@
 "href=\"#freespeech\">#freespeech</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Yes, indeed, we believe you have a free speech right to call the operating "
 "system by any name you wish.  We ask that people call it GNU/Linux as a "
@@ -722,7 +726,7 @@
 "brought the system into existence."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since everyone knows the role of GNU in developing the system, doesn't the "
 "&ldquo;GNU/&rdquo; in the name go without saying? <span "
@@ -730,7 +734,7 @@
 "href=\"#everyoneknows\">#everyoneknows</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Experience shows that the system's users, and the computer-using public in "
 "general, often know nothing about the GNU system.  Most articles about the "
@@ -739,7 +743,7 @@
 "Who Have Never Heard of GNU</a> explains further."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who say this are probably geeks thinking of the geeks they know.  "
 "Geeks often do know about GNU, but many have a completely wrong idea of what "
@@ -747,7 +751,7 @@
 "href=\"#tools\">&ldquo;tools&rdquo;</a>, or a project to develop tools."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The wording of this question, which is typical, illustrates another common "
 "misconception.  To speak of &ldquo;GNU's role&rdquo; in developing something "
@@ -756,14 +760,14 @@
 "activity, but not that of GNU."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since I know the role of GNU in this system, why does it matter what name I "
 "use? <span class=\"anchor-reference-id\">(<a "
 "href=\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your words don't reflect your knowledge, you don't teach others.  Most "
 "people who have heard of the GNU/Linux system think it is "
@@ -771,20 +775,20 @@
 "intended to be &ldquo;open source&rdquo;.  If you don't tell them, who will?"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't shortening &ldquo;GNU/Linux&rdquo; to &ldquo;Linux&rdquo; just like "
 "shortening &ldquo;Microsoft Windows&rdquo; to &ldquo;Windows&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#windows\">#windows</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It's useful to shorten a frequently-used name, but not if the abbreviation "
 "is misleading."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Almost everyone in developed countries really does know that the "
 "&ldquo;Windows&rdquo; system is made by Microsoft, so shortening "
@@ -794,19 +798,19 @@
 "where the system comes from."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The question is itself misleading because GNU and Microsoft are not the same "
 "kind of thing.  Microsoft is a company; GNU is an operating system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't GNU a collection of programming tools that were included in Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "People who think that Linux is an entire operating system, if they hear "
 "about GNU at all, often get a wrong idea of what GNU is.  They may think "
@@ -817,14 +821,14 @@
 "operating system is labeled &ldquo;Linux&rdquo;."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Project was named after the GNU operating system&mdash;it's the "
 "project to develop the GNU system.  (See <a "
 "href=\"/gnu/initial-announcement.html\">the 1983 initial announcement</a>.)"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We developed programs such as GCC, GNU Emacs, GAS, GLIBC, BASH, etc., "
 "because we needed them for the GNU operating system.  GCC, the GNU Compiler "
@@ -833,14 +837,14 @@
 "GNU Chess and GNOME for the GNU system too."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the difference between an operating system and a kernel? <span "
 "class=\"anchor-reference-id\">(<a "
 "href=\"#osvskernel\">#osvskernel</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "An operating system, as we use the term, means a collection of programs that "
 "are sufficient to use the computer to do a wide variety of jobs.  A general "
@@ -848,7 +852,7 @@
 "many users may want to do."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The kernel is one of the programs in an operating system&mdash;the program "
 "that allocates the machine's resources to the other programs that are "
@@ -856,7 +860,7 @@
 "programs."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "To confuse matters, some people use the term &ldquo;operating system&rdquo; "
 "to mean &ldquo;kernel&rdquo;.  Both uses of the term go back many years.  "
@@ -868,7 +872,7 @@
 "system, we use the term &ldquo;operating system&rdquo; in the same way."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the time when people speak of the &ldquo;Linux operating "
 "system&rdquo; they are using &ldquo;operating system&rdquo; in the same "
@@ -879,7 +883,7 @@
 "software you mean."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of "
@@ -887,20 +891,20 @@
 "GNU/Linux system distributions."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The kernel of a system is like the foundation of a house.  How can a house "
 "be almost complete when it doesn't have a foundation? <span "
 "class=\"anchor-reference-id\">(<a href=\"#house\">#house</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "A kernel is not much like the foundation of a house because building an "
 "operating system is not much like building a house."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A house is built from lots of little general parts that are cut and put "
 "together in situ.  They have to be put together from the bottom up.  Thus, "
@@ -908,7 +912,7 @@
 "all you have is a hole in the ground."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "By contrast, an operating system consists of complex components that can be "
 "developed in any order.  When you have developed most of the components, "
@@ -918,37 +922,37 @@
 "system in 1992."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't the kernel the brain of the system? <span "
 "class=\"anchor-reference-id\">(<a href=\"#brain\">#brain</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A computer system is not much like a human body, and no part of it plays a "
 "role comparable to that of the brain in a human."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't writing the kernel most of the work in an operating system? <span "
 "class=\"anchor-reference-id\">(<a "
 "href=\"#kernelmost\">#kernelmost</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "No, many components take a lot of work."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "An operating system requires a kernel.  Since the GNU Project didn't develop "
 "a kernel, how can the system be GNU?<span class=\"anchor-reference-id\">(<a "
 "href=\"#nokernel\">#nokernel</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The people who argue that way for calling the system &ldquo;Linux&rdquo; are "
 "using a double standard.  An operating system requires compilers, editors, "
@@ -957,34 +961,34 @@
 "any of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "That standard is too strict, not the right way to judge the contributions of "
 "any contributor."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds made an important contribution to the operating system we "
 "use; the GNU Project started earlier and contributed much more.  The name "
 "&ldquo;GNU/Linux&rdquo; gives credit to each."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How can GNU be an operating system, if I can't get something called "
 "&ldquo;GNU&rdquo; and install it? <span class=\"anchor-reference-id\">(<a "
 "href=\"#notinstallable\">#notinstallable</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Many <a href=\"/distros/distros.html\"> packaged and installable versions of "
 "GNU</a> are available.  None of them is called simply &ldquo;GNU&rdquo;, but "
 "GNU is what they basically are."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We expected to release the GNU system packaged for installation, but this "
 "plan was overtaken by events: in 1992 others were already packaging GNU "
@@ -996,14 +1000,14 @@
 "version with the GNU Hurd kernel&mdash;which wasn't ready yet."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Hurd kernel never became sufficiently ready; we only recommend it to "
 "those interested in working on it.  So we never packaged GNU with the GNU "
 "Hurd kernel.  However, Debian packaged this combination as Debian GNU/Hurd."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are now developing an advanced Scheme-based package manager called Guix "
 "and a complete system distribution based on it called the <a "
@@ -1011,14 +1015,14 @@
 "includes repackaging a substantial part of the GNU system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We never took the last step of packaging GNU under the name "
 "&ldquo;GNU&rdquo;, but that doesn't alter what kind of thing GNU is.  GNU is "
 "an operating system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "We're calling the whole system after the kernel, Linux.  Isn't it normal to "
 "name an operating system after a kernel? <span "
@@ -1026,7 +1030,7 @@
 "href=\"#afterkernel\">#afterkernel</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "That practice seems to be very rare&mdash;we can't find any examples other "
 "than the misuse of the name &ldquo;Linux&rdquo;.  Normally an operating "
@@ -1036,7 +1040,7 @@
 "or &ldquo;the such-and-such kernel&rdquo;."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Because those two constructions are used synonymously, the expression "
 "&ldquo;the Linux kernel&rdquo; can easily be misunderstood as meaning "
@@ -1046,13 +1050,13 @@
 "kernel.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can another system have &ldquo;the feel of Linux&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is no such thing as the &ldquo;feel of Linux&rdquo; because Linux has "
 "no user interfaces.  Like any modern kernel, Linux is a base for running "
@@ -1061,35 +1065,35 @@
 "&ldquo;feel&rdquo; comes from them."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  How about "
 "recommending a shorter name? <span class=\"anchor-reference-id\">(<a "
 "href=\"#long\">#long</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "For a while we tried the name &ldquo;LiGNUx&rdquo;, which combines the words "
 "&ldquo;GNU&rdquo; and &ldquo;Linux&rdquo;.  The reaction was very bad.  "
 "People accept &ldquo;GNU/Linux&rdquo; much better."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
 "call it &ldquo;GNU/Linux&rdquo; <a href=\"#justgnu\"> for the reasons given "
 "below</a>."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How about calling the system &ldquo;GliNUx&rdquo; (instead of "
 "&ldquo;GNU/Linux&rdquo;)? <span class=\"anchor-reference-id\">(<a "
 "href=\"#long1\">#long1</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The name &ldquo;GNU&rdquo; does not visibly appear in &ldquo;Glinux,&rdquo; "
 "so most people would not notice it is there.  Even if it is capitalized as "
@@ -1097,82 +1101,82 @@
 "reference to GNU."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be comparable to writing &ldquo;GNU/Linux,&rdquo; but putting "
 "&ldquo;GNU/&rdquo; in print so small that most people could not read it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  Why should "
 "I go to the trouble of saying &ldquo;GNU/&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#long2\">#long2</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
 "the system that we developed, can't you take one second to recognize our "
 "work?"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Unfortunately, &ldquo;GNU/Linux&rdquo; is five syllables. People won't use "
 "such a long term. Shouldn't you find a shorter one? <span "
 "class=\"anchor-reference-id\">(<a href=\"#long3\">#long3</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, &ldquo;GNU/Linux&rdquo; is only four syllables.  "
 "&ldquo;Unfortunately&rdquo; is five syllables, yet people show no sign of "
 "reluctance to use that word."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Stallman doesn't ask us to call him &ldquo;Richard Matthew Stallman&rdquo; "
 "every the time.  So why ask us to say &ldquo;GNU/Linux&rdquo; every time? "
 "<span class=\"anchor-reference-id\">(<a href=\"#long4\">#long4</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Omitting &ldquo;Matthew&rdquo; does not misrepresent anything important "
 "about Stallman's nature, origin, ideas or purpose.  Omitting "
 "&ldquo;GNU&rdquo; does misrepresent those things about the GNU/Linux system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is an example of a frequent way of hiding a fallacy: to bury it inside "
 "a misleading analogy.  A better analogy would be, &ldquo;Why shouldn't we "
 "call Stallman &lsquo;Torvalds&rsquo;?&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since Linux is a secondary contribution, would it be false to the facts to "
 "call the system simply &ldquo;GNU&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#justgnu\">#justgnu</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would not be false to the facts, but it is not the best thing to do.  "
 "Here are the reasons we call that system version &ldquo;GNU/Linux&rdquo; "
 "rather than just &ldquo;GNU&rdquo;:"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It's not exactly GNU&mdash;it has a different kernel (that is, Linux).  "
 "Distinguishing GNU/Linux from GNU is useful."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It would be ungentlemanly to ask people to <em>stop</em> giving any credit "
 "to Linus Torvalds.  He did write an important component of the system.  We "
@@ -1184,7 +1188,7 @@
 "the system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
 "&ldquo;GNU&rdquo; they may simply not recognize we're talking about the same "
@@ -1192,7 +1196,7 @@
 "what they have heard about."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "I would have to pay a fee if I use &ldquo;Linux&rdquo; in the name of a "
 "product, and that would also apply if I say &ldquo;GNU/Linux&rdquo;.  Is it "
@@ -1201,20 +1205,20 @@
 "href=\"#trademarkfee\">#trademarkfee</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There's nothing wrong in calling the system &ldquo;GNU&rdquo;; basically, "
 "that's what it is.  It is nice to give Linus Torvalds a share of the credit "
 "as well, but you have no obligation to pay for the privilege of doing so."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "So if you want to refer to the system simply as &ldquo;GNU&rdquo;, to avoid "
 "paying the fee for calling it &ldquo;Linux&rdquo;, we won't criticize you."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today; it includes "
 "TeX, X11, Apache, Perl, and many more programs.  Don't your arguments imply "
@@ -1223,14 +1227,14 @@
 "href=\"#many\">#many</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "What we say is that you ought to give the system's principal developer a "
 "share of the credit.  The principal developer is the GNU Project, and the "
 "system is basically GNU."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you feel even more strongly about giving credit where it is due, you "
 "might feel that some secondary contributors also deserve credit in the "
@@ -1240,7 +1244,7 @@
 "mention, and you want to write GNU/Linux/Perl, go ahead."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Since a long name such as GNU/X11/Apache/Linux/TeX/Perl/Python/FreeCiv "
 "becomes absurd, at some point you will have to set a threshold and omit the "
@@ -1249,7 +1253,7 @@
 "against it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Different threshold levels would lead to different choices of name for the "
 "system.  But one name that cannot result from concerns of fairness and "
@@ -1259,14 +1263,14 @@
 "(GNU)."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "systemd plays an important role in the GNU/Linux system as it is today; are "
 "we obligated to call it GNU/systemd/Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#others\">#others</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "systemd is a fairly important component, but not as important as the kernel "
 "(Linux), nor as important as the basis of the system as a whole (GNU).  "
@@ -1275,14 +1279,14 @@
 "so."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today, but they don't "
 "insist on calling it XYZ/Linux.  Why should we treat GNU specially? <span "
 "class=\"anchor-reference-id\">(<a href=\"#others\">#others</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Thousands of projects have developed programs commonly included in today's "
 "GNU/Linux systems.  They all deserve credit for their contributions, but "
@@ -1290,21 +1294,21 @@
 "ask to be credited as such."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is different because it is more than just a contributed program, more "
 "than just a collection of contributed programs.  GNU is the framework on "
 "which the system was made."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "GNU is a small fraction of the system nowadays, so why should we mention it? "
 "<span class=\"anchor-reference-id\">(<a "
 "href=\"#allsmall\">#allsmall</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In 2008, we found that GNU packages made up 15% of the &ldquo;main&rdquo; "
 "repository of the gNewSense GNU/Linux distribution.  Linux made up 1.5%.  So "
@@ -1312,14 +1316,14 @@
 "&ldquo;Linux&rdquo;."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is a small fraction of the system nowadays, and Linux is an even smaller "
 "fraction.  But they are the system's core; the system was made by combining "
 "them.  Thus, the name &ldquo;GNU/Linux&rdquo; remains appropriate."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many companies contributed to the system as it is today; doesn't that mean "
 "we ought to call it GNU/Red&nbsp;Hat/Novell/Linux? <span "
@@ -1327,7 +1331,7 @@
 "href=\"#manycompanies\">#manycompanies</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is not comparable to Red Hat or Novell; it is not a company, or an "
 "organization, or even an activity.  GNU is an operating system.  (When we "
@@ -1336,7 +1340,7 @@
 "appear in its name."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Much of those companies' contribution to the GNU/Linux system lies in the "
 "code they have contributed to various GNU packages including GCC and GNOME.  "
@@ -1344,14 +1348,14 @@
 "the GNU developers."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a "
 "href=\"#whyslash\">#whyslash</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean "
@@ -1359,7 +1363,7 @@
 "package.&rdquo; Neither of those meanings fits the situation at hand."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is not a GNU package; that is, it wasn't developed under the GNU "
 "Project's aegis or contributed specifically to the GNU Project.  Linus "
@@ -1367,18 +1371,18 @@
 "&ldquo;Linux, which is a GNU package&rdquo; meaning is not right."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
 "free GNU/Linux distros do have a <a "
-"href=\"http://directory.fsf.org/project/linux\";>separate version of "
-"Linux</a>, since the &ldquo;standard&rdquo; version contains non-free "
+"href=\"https://directory.fsf.org/wiki/Linux-libre\";>separate version of "
+"Linux</a>, since the &ldquo;standard&rdquo; version contains nonfree "
 "firmware &ldquo;blobs&rdquo;.  If this were part of the GNU Project, it "
 "could be considered &ldquo;GNU Linux&rdquo;; but we would not want to call "
 "it that, because it would be too confusing."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We're talking about a version of GNU, the operating system, distinguished by "
 "having Linux as the kernel.  A slash fits the situation because it means "
@@ -1386,7 +1390,7 @@
 "system is the combination of GNU and Linux; hence, &ldquo;GNU/Linux&rdquo;."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are other ways to express &ldquo;combination&rdquo;.  If you think "
 "that a plus-sign is clearer, please use that.  In French, a hyphen is clear: "
@@ -1394,67 +1398,67 @@
 "Linux&rdquo;."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How is the name &ldquo;GNU/Linux&rdquo; pronounced? <span "
 "class=\"anchor-reference-id\">(<a href=\"#pronounce\">#pronounce</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please pronounce it as &ldquo;GNU slash Linux.&rdquo; If you don't pronounce "
 "the slash, people will think you are saying &ldquo;GNU Linux,&rdquo; which "
 "is <a href=\"#whyslash\">not a suitable name for the combination</a>."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU Emacs&rdquo; rather than "
 "&ldquo;GNU/Emacs&rdquo;? <span class=\"anchor-reference-id\">(<a "
 "href=\"#whynoslash\">#whynoslash</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Emacs&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Emacs&rdquo;.  That is the right "
 "way to describe a program called Emacs which is a GNU package."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;GNU/Emacs&rdquo; would mean the combination of GNU, the operating "
 "system, and the program Emacs.  That doesn't fit this program, so "
 "&ldquo;GNU/Emacs&rdquo; is the wrong way to refer to it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why &ldquo;GNU/Linux&rdquo; rather than &ldquo;Linux/GNU&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is right and proper to mention the principal contribution first.  The GNU "
 "contribution to the system is not only bigger than Linux and prior to Linux, "
 "we actually started the whole activity."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the lowest "
 "level of the system and GNU fills technically higher levels."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
 "lot better than what people usually do, which is to omit GNU entirely and "
 "make it seem that the whole system is Linux."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
 "say anything about what the system consists of.  Why shouldn't they call it "
@@ -1462,28 +1466,28 @@
 "href=\"#distronames0\">#distronames0</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling a system &ldquo;Foobar Linux&rdquo; implies that it's a flavor of "
 "&ldquo;Linux,&rdquo; and people <a href=\"#distronames\">understand it that "
 "way</a>."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If they called a GNU/Linux distro &ldquo;Foobar BSD,&rdquo; you would call "
 "that a mistake.  &ldquo;This system is not BSD,&rdquo; you would tell them.  "
 "Well, it's not Linux either."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro is called &ldquo;Foobar Linux&rdquo;; doesn't that show it's "
 "really Linux? <span class=\"anchor-reference-id\">(<a "
 "href=\"#distronames\">#distronames</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It means that the people who make the &ldquo;Foobar Linux&rdquo; distro are "
 "repeating the common mistake. We appreciate that distributions like Debian, "
@@ -1492,7 +1496,7 @@
 "distribution, you will encourage it to do the same."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's official name is &ldquo;Foobar Linux&rdquo;; isn't it wrong to "
 "call the distro anything but &ldquo;Foobar Linux&rdquo;? <span "
@@ -1500,7 +1504,7 @@
 "href=\"#distronames1\">#distronames1</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When they spread misinformation by changing &ldquo;GNU&rdquo; to "
 "&ldquo;Linux&rdquo;, and call their version of it &ldquo;Foobar "
@@ -1508,7 +1512,7 @@
 "it &ldquo;Foobar GNU/Linux&rdquo;."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be more effective to ask companies such as Mandrake, Red Hat and "
 "IBM to call their distributions &ldquo;GNU/Linux&rdquo; rather than asking "
@@ -1516,7 +1520,7 @@
 "href=\"#companies\">#companies</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It isn't a choice of one or the other&mdash;we ask companies and "
 "organizations and individuals to help spread the word about this.  In fact, "
@@ -1528,7 +1532,7 @@
 "was right."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We can't make them do this right, but we're not the sort to give up just "
 "because the road isn't easy.  You may not have as much influence at your "
@@ -1537,7 +1541,7 @@
 "&ldquo;GNU/Linux&rdquo;."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to reserve the name &ldquo;GNU/Linux&rdquo; for "
 "distributions that are purely free software? After all, that is the ideal of "
@@ -1545,24 +1549,24 @@
 "href=\"#reserve\">#reserve</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
-"The widespread practice of adding non-free software to the GNU/Linux system "
-"is a major problem for our community.  It teaches the users that non-free "
+"The widespread practice of adding nonfree software to the GNU/Linux system "
+"is a major problem for our community.  It teaches the users that nonfree "
 "software is ok, and that using it is part of the spirit of "
 "&ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of "
-"their mission to help users use non-free add-ons, and may even invite "
+"their mission to help users use nonfree add-ons, and may even invite "
 "salesmen to come and make sales pitches for them.  They adopt goals such as "
 "&ldquo;helping the users&rdquo; of GNU/Linux (including helping them use "
-"non-free applications and drivers), or making the system more popular even "
-"at the cost of freedom."
+"nonfree applications and drivers), or making the system more popular even at "
+"the cost of freedom."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The question is how to try to change this."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Given that most of the community which uses GNU with Linux already does not "
 "realize that's what it is, for us to disown these adulterated versions, "
@@ -1571,18 +1575,18 @@
 "they never thought these systems were GNU in the first place."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The way to lead these users to see a connection with freedom is exactly the "
 "opposite: to inform them that all these system versions <em>are</em> "
 "versions of GNU, that they all are based on a system that exists "
 "specifically for the sake of the users' freedom.  With this understanding, "
-"they can start to recognize the distributions that include non-free software "
+"they can start to recognize the distributions that include nonfree software "
 "as perverted, adulterated versions of GNU, instead of thinking they are "
 "proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is very useful to start GNU/Linux User Groups, which call the system "
 "GNU/Linux and adopt the ideals of the GNU Project as a basis for their "
@@ -1593,14 +1597,14 @@
 "you along!"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not make a GNU distribution of Linux (sic) and call that GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a "
 "href=\"#gnudist\">#gnudist</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "All the &ldquo;Linux&rdquo; distributions are actually versions of the GNU "
 "system with Linux as the kernel.  The purpose of the term "
@@ -1609,7 +1613,7 @@
 "point we want to make."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "As for developing a distribution of GNU/Linux, we already did this once, "
 "when we funded the early development of Debian GNU/Linux.  To do it again "
@@ -1618,27 +1622,27 @@
 "it would serve no purpose."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Instead we help the developers of 100% free GNU/Linux distributions, such as "
 "gNewSense and Ututo."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not just say &ldquo;Linux is the GNU kernel&rdquo; and release some "
 "existing version of GNU/Linux under the name &ldquo;GNU&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#linuxgnu\">#linuxgnu</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It might have been a good idea to adopt Linux as the GNU kernel back in "
 "1992.  If we had realized, then, how long it would take to get the GNU Hurd "
 "to work, we might have done that.  (Alas, that is hindsight.)"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we were to take an existing version of GNU/Linux and relabel it as "
 "&ldquo;GNU&rdquo;, that would be somewhat like making a version of the GNU "
@@ -1646,13 +1650,13 @@
 "want to act like that."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Did the GNU Project condemn and oppose use of Linux in the early days? <span "
 "class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We did not adopt Linux as our kernel, but we didn't condemn or oppose it.  "
 "In 1993 we started discussing the arrangements to sponsor the development of "
@@ -1663,7 +1667,7 @@
 "and nonportable; they needed to be cleaned up for installation."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who had made the changes showed little interest in cooperating "
 "with us.  One of them actually told us that he didn't care about working "
@@ -1674,7 +1678,7 @@
 "(and still practically the only) group that was unwilling to work with us."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It was this experience that first showed us that people were calling a "
 "version of the GNU system &ldquo;Linux&rdquo;, and that this confusion was "
@@ -1683,34 +1687,34 @@
 "&ldquo;Linux&rdquo; misnomer."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why did you wait so long before asking people to use the name GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually we didn't.  We began talking privately with developers and "
 "distributors about this in 1994, and made a more public campaign in 1996.  "
 "We will continue for as long as it's necessary."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should the GNU/<i>name</i> convention be applied to all programs that are "
 "GPL'ed? <span class=\"anchor-reference-id\">(<a "
 "href=\"#allgpled\">#allgpled</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We never refer to individual programs as &ldquo;GNU/<i>name</i>&rdquo;.  "
 "When a program is a GNU package, we may call it &ldquo;GNU "
 "<i>name</i>&rdquo;."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU, the operating system, is made up of many different programs.  Some of "
 "the programs in GNU were written as part of the GNU Project or specifically "
@@ -1718,7 +1722,7 @@
 "&ldquo;GNU&rdquo; in their names."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It's up to the developers of a program to decide if they want to contribute "
 "it and make it a GNU package.  If you have developed a program and you would "
@@ -1727,7 +1731,7 @@
 "and decide whether we want it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It wouldn't be fair to put the name GNU on every individual program that is "
 "released under the GPL.  If you write a program and release it under the "
@@ -1739,7 +1743,7 @@
 "improper."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In contrast, we do deserve the overall credit for the GNU operating system "
 "as a whole, even though not for each and every program in it.  The system "
@@ -1747,7 +1751,7 @@
 "1984, many years before Linux was begun."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The operating system in which Linux became popular was basically the same as "
 "the GNU operating system.  It was not entirely the same, because it had a "
@@ -1755,7 +1759,7 @@
 "GNU.  It was the GNU/Linux system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux continues to be used primarily in derivatives of that system&mdash;in "
 "today's versions of the GNU/Linux system.  What gives these systems their "
@@ -1763,14 +1767,14 @@
 "alone."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since much of GNU comes from Unix, shouldn't GNU give credit to Unix by "
 "using &ldquo;Unix&rdquo; in its name? <span "
 "class=\"anchor-reference-id\">(<a href=\"#unix\">#unix</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Actually, none of GNU comes from Unix.  Unix was proprietary software (and "
 "still is), so using any of its code in GNU would have been illegal.  This is "
@@ -1780,7 +1784,7 @@
 "parts of them, from Unix; everything had to be written afresh."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "No code in GNU comes from Unix, but GNU is a Unix-compatible system; "
 "therefore, many of the ideas and specifications of GNU do come from Unix.  "
@@ -1789,18 +1793,18 @@
 "tradition of recursive acronyms that started in the 70s."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
 "The author of TINT wrote another implementation of TECO (there were already "
 "many of them, for various systems), but instead of calling it by a dull name "
 "like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of a clever "
 "amusing name.  (That's what hacking means: <a "
-"href=\"http://stallman.org/articles/on-hacking.html\";>playful "
+"href=\"https://stallman.org/articles/on-hacking.html\";>playful "
 "cleverness</a>.)"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Other hackers enjoyed that name so much that we imitated the approach.  It "
 "became a tradition that, when you were writing from scratch a program that "
@@ -1810,7 +1814,7 @@
 "we called our replacement for Unix &ldquo;GNU's Not Unix&rdquo;."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Historically, AT&amp;T which developed Unix did not want anyone to give it "
 "credit by using &ldquo;Unix&rdquo; in the name of a similar system, not even "
@@ -1820,27 +1824,27 @@
 "different name that didn't include &ldquo;Unix&rdquo;."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we say &ldquo;GNU/BSD&rdquo; too? <span "
 "class=\"anchor-reference-id\">(<a href=\"#bsd\">#bsd</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems, "
 "because that term does not fit the history of the BSD systems."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
-"The BSD system was developed by UC Berkeley as non-free software in the 80s, "
+"The BSD system was developed by UC Berkeley as nonfree software in the 80s, "
 "and became free in the early 90s.  A free operating system that exists today "
 "is almost certainly either a variant of the GNU system, or a kind of BSD "
 "system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "People sometimes ask whether BSD too is a variant of GNU, as GNU/Linux is.  "
 "It is not.  The BSD developers were inspired to make their code free "
@@ -1849,7 +1853,7 @@
 "with GNU."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "BSD systems today use some GNU packages, just as the GNU system and its "
 "variants use some BSD programs; however, taken as wholes, they are two "
@@ -1858,13 +1862,13 @@
 "the situation."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The connection between GNU/Linux and GNU is much closer, and that's why the "
 "name &ldquo;GNU/Linux&rdquo; is appropriate for it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is a version of GNU which uses the kernel from NetBSD.  Its developers "
 "call it &ldquo;Debian GNU/NetBSD&rdquo;, but "
@@ -1873,14 +1877,14 @@
 "the system is the same as the GNU/Linux system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "If I install the GNU tools on Windows, does that mean I am running a "
 "GNU/Windows system? <span class=\"anchor-reference-id\">(<a "
 "href=\"#othersys\">#othersys</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
 "GNU are just a part of the GNU software, which is just a part of the GNU "
@@ -1889,13 +1893,13 @@
 "different situation from GNU/Linux."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can't Linux be used without GNU? <span class=\"anchor-reference-id\">(<a "
 "href=\"#justlinux\">#justlinux</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is used by itself, or with small other programs, in some appliances.  "
 "These small software systems are a far cry from the GNU/Linux system.  Users "
@@ -1904,19 +1908,19 @@
 "show how different those small platforms are from GNU/Linux."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How much of the GNU system is needed for the system to be GNU/Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "&ldquo;How much&rdquo; is not a meaningful question because the GNU system "
 "does not have precise boundaries."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is an operating system maintained by a community.  It includes far more "
 "than just the GNU software packages (of which we have a specific list), and "
@@ -1926,35 +1930,35 @@
 "much&rdquo; you used."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we look at the level of packages, Linux is one important package in the "
 "GNU/Linux system.  The inclusion of one important GNU package is enough to "
 "justify our request for equal mention."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Are there complete Linux systems [sic] without GNU? <span "
 "class=\"anchor-reference-id\">(<a "
 "href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There are complete systems that contain Linux and not GNU; Android is an "
 "example.  But it is a mistake to call them &ldquo;Linux&rdquo; systems, just "
 "as it is a mistake to call GNU a &ldquo;Linux&rdquo; system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android is very different from the GNU/Linux system&mdash;because the two "
 "have very little code in common.  In fact, the only thing they have in "
 "common is Linux."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
 "necessary to say things like, &ldquo;Android contains Linux, but it isn't "
@@ -1962,7 +1966,7 @@
 "[meaning the GNU system].&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android contains just as much of Linux as GNU/Linux does.  What it doesn't "
 "have is the GNU system.  Android replaces that with Google software that "
@@ -1970,20 +1974,20 @@
 "absence of GNU."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Is it correct to say &ldquo;using Linux&rdquo; if it refers to using "
 "GNU/Linux and using Android? <span class=\"anchor-reference-id\">(<a "
 
"href=\"#usegnulinuxandandroidlinuxsyswithoutgnu\">#usegnulinuxandandroidlinuxsyswithoutgnu</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Far from it.  That usage is so strained that people will not understand the "
 "intended meaning."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public will find it very strange to speak of using Android as "
 "&ldquo;using Linux&rdquo;.  It's like having a conversation, then saying you "
@@ -1991,14 +1995,14 @@
 "system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public <em>will</em> understand the idea of &ldquo;using Linux&rdquo; "
 "when it's really GNU/Linux, by way of the usual misunderstanding: thinking "
 "of the whole system as &ldquo;Linux&rdquo;."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Use of Android and use of GNU/Linux are totally different, as different as "
 "driving a car and riding a bicycle.  The fact that the first two both "
@@ -2011,14 +2015,14 @@
 "&ldquo;using GNU/Linux and Android.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not call the system &ldquo;Linux&rdquo; anyway, and strengthen Linus "
 "Torvalds' role as posterboy for our community? <span "
 "class=\"anchor-reference-id\">(<a href=\"#helplinus\">#helplinus</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Linus Torvalds is the &ldquo;posterboy&rdquo; (other people's choice of "
 "word, not ours) for his goals, not ours.  His goal is to make the system "
@@ -2030,19 +2034,19 @@
 "&ldquo;Linux&rdquo; with that principle."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus publicly states his disagreement with the free software movement's "
-"ideals.  He developed non-free software in his job for many years (and said "
+"ideals.  He developed nonfree software in his job for many years (and said "
 "so to a large audience at a &ldquo;Linux&rdquo;World show), and publicly "
-"invited fellow developers of Linux, the kernel, to use non-free software to "
+"invited fellow developers of Linux, the kernel, to use nonfree software to "
 "work on it with him.  He goes even further, and rebukes people who suggest "
 "that engineers and scientists should consider social consequences of our "
 "technical work&mdash;rejecting the lessons society learned from the "
 "development of the atom bomb."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with writing a free program for the motivations of "
 "learning and having fun; the kernel Linus wrote for those reasons was an "
@@ -2054,14 +2058,14 @@
 "views."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong for us to label Linus Torvalds' work as GNU? <span "
 "class=\"anchor-reference-id\">(<a "
 "href=\"#claimlinux\">#claimlinux</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong, so we don't do that.  Torvalds' work is Linux, the "
 "kernel; we are careful not to attribute that work to the GNU Project or "
@@ -2069,24 +2073,24 @@
 "name &ldquo;GNU/Linux&rdquo; gives him a share of the credit."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Does Linus Torvalds agree that Linux is just the kernel? <span "
 "class=\"anchor-reference-id\">(<a "
 "href=\"#linusagreed\">#linusagreed</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "He recognized this at the beginning.  The earliest Linux release notes said, "
 "<a "
-"href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>
 "
+"href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>
 "
 "&ldquo;Most of the tools used with linux are GNU software and are under the "
 "GNU copyleft. These tools aren't in the distribution - ask me (or GNU)  for "
 "more info&rdquo;</a>."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not finish the GNU Hurd kernel, release the GNU system as a whole, and "
 "forget the question of what to call GNU/Linux? <span "
@@ -2094,30 +2098,30 @@
 "href=\"#finishhurd\">#finishhurd</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We would like credit for the GNU operating system no matter which kernel is "
 "used with it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Making the GNU Hurd work well enough to compete with Linux would be a big "
 "job, and it's not clearly necessary.  The only thing ethically wrong with "
 "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the best "
 "fix for that problem is <a "
-"href=\"http://fsf.org/campaigns/priority-projects\";> developing free "
+"href=\"https://www.fsf.org/campaigns/priority-projects\";> developing free "
 "replacement for the blobs</a>."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The battle is already lost&mdash;society has made its decision and we can't "
 "change it, so why even think about it? <span "
 "class=\"anchor-reference-id\">(<a href=\"#lost\">#lost</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This isn't a battle, it is a campaign of education.  What to call the system "
 "is not a single decision, to be made at one moment by &ldquo;society&rdquo;: "
@@ -2127,14 +2131,14 @@
 "educate others."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Society has made its decision and we can't change it, so what good does it "
 "do if I say &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id\">(<a "
 "href=\"#whatgood\">#whatgood</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is not an all-or-nothing situation: correct and incorrect pictures are "
 "being spread more or less by various people.  If you call the system "
@@ -2146,21 +2150,21 @@
 "some of them will spread the correction to others."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to call the system &ldquo;Linux&rdquo; and teach "
 "people its real origin with a ten-minute explanation? <span "
 "class=\"anchor-reference-id\">(<a href=\"#explain\">#explain</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "If you help us by explaining to others in that way, we appreciate your "
 "effort, but that is not the best method.  It is not as effective as calling "
 "the system &ldquo;GNU/Linux&rdquo;, and uses your time inefficiently."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is ineffective because it may not sink in, and surely will not "
 "propagate.  Some of the people who hear your explanation will pay attention, "
@@ -2170,7 +2174,7 @@
 "particularly intending to, they will help spread the incorrect picture."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is inefficient because it takes a lot more time.  Saying and writing "
 "&ldquo;GNU/Linux&rdquo; will take you only a few seconds a day, not minutes, "
@@ -2179,14 +2183,14 @@
 "help the GNU Project effectively."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people laugh at you when you ask them to call the system GNU/Linux.  "
 "Why do you subject yourself to this treatment? <span "
 "class=\"anchor-reference-id\">(<a href=\"#treatment\">#treatment</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; tends to give people a mistaken "
 "picture of the system's history and reason for existence.  People who laugh "
@@ -2195,28 +2199,28 @@
 "it.  If they knew the truth, they probably wouldn't laugh."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Why do we take the risk of making a request that sometimes leads people to "
 "ridicule us? Because often it has useful results that help the GNU Project.  "
 "We will run the risk of undeserved abuse to achieve our goals."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you see such an ironically unfair situation occurring, please don't sit "
 "idly by.  Please teach the laughing people the real history.  When they see "
 "why the request is justified, those who have any sense will stop laughing."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people condemn you when you ask them to call the system GNU/Linux.  "
 "Don't you lose by alienating them? <span class=\"anchor-reference-id\">(<a "
 "href=\"#alienate\">#alienate</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not much.  People who don't appreciate our role in developing the system are "
 "unlikely to make substantial efforts to help us.  If they do work that "
@@ -2226,7 +2230,7 @@
 "ability to recruit the help of others."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It makes no sense to worry about alienating people who are already mostly "
 "uncooperative, and it is self-defeating to be deterred from correcting a "
@@ -2234,64 +2238,64 @@
 "will continue trying to correct the misnomer."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Whatever you contributed, is it legitimate to rename the operating system? "
 "<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are not renaming anything; we have been calling this system "
 "&ldquo;GNU&rdquo; ever since we announced it in 1983.  The people who tried "
 "to rename it to &ldquo;Linux&rdquo; should not have done so."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong to force people to call the system &ldquo;GNU/Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong to force them, and we don't try.  We call the system "
 "&ldquo;GNU/Linux&rdquo;, and we ask you to do it too."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not sue people who call the whole system &ldquo;Linux&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are no legal grounds to sue them, but since we believe in freedom of "
 "speech, we wouldn't want to do that anyway.  We ask people to call the "
 "system &ldquo;GNU/Linux&rdquo; because that is the right thing to do."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Shouldn't you put something in the GNU GPL to require people to call the "
 "system &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id\">(<a "
 "href=\"#require\">#require</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The purpose of the GNU GPL is to protect the users' freedom from those who "
 "would make proprietary versions of free software.  While it is true that "
 "those who call the system &ldquo;Linux&rdquo; often do things that limit the "
-"users' freedom, such as bundling non-free software with the GNU/Linux system "
-"or even developing non-free software for such use, the mere act of calling "
+"users' freedom, such as bundling nonfree software with the GNU/Linux system "
+"or even developing nonfree software for such use, the mere act of calling "
 "the system &ldquo;Linux&rdquo; does not, in itself, deny users their "
 "freedom.  It seems improper to make the GPL restrict what name people can "
 "use for the system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you objected to the original BSD license's advertising requirement to "
 "give credit to the University of California, isn't it hypocritical to demand "
@@ -2299,20 +2303,20 @@
 "href=\"#BSDlicense\">#BSDlicense</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would be hypocritical to make the name GNU/Linux a license requirement, "
 "and we don't.  We only <em>ask</em> you to give us the credit we deserve."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please note that there are at least <a href=\"/licenses/bsd.html\"> two "
 "different BSD licenses</a>.  For clarity's sake, please don't use the term "
 "&ldquo;BSD license&rdquo; without specifying which one."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you failed to put something in the GNU GPL to require people to call "
 "the system &ldquo;GNU&rdquo;, you deserve what happened; why are you "
@@ -2320,7 +2324,7 @@
 "href=\"#deserve\">#deserve</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The question presupposes a rather controversial general ethical premise: "
 "that if people do not force you to treat them fairly, you are entitled to "
@@ -2328,49 +2332,49 @@
 "might makes right."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope you disagree with that premise just as we do."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't you be better off not contradicting what so many people believe? "
 "<span class=\"anchor-reference-id\">(<a "
 "href=\"#contradict\">#contradict</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't think we should go along with large numbers of people because they "
 "have been misled.  We hope you too will decide that truth is important."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We could never have developed a free operating system without first denying "
 "the belief, held by most people, that proprietary software was legitimate "
 "and acceptable."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
 "<span class=\"anchor-reference-id\">(<a "
 "href=\"#somanyright\">#somanyright</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "We don't think that the popularity of an error makes it the truth."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it better to call the system by the name most users already know? "
 "<span class=\"anchor-reference-id\">(<a "
 "href=\"#knownname\">#knownname</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo; includes "
 "&ldquo;Linux&rdquo;, they will recognize what you're talking about.  If you "
@@ -2378,7 +2382,7 @@
 "once in a while, they will all understand."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many people care about what's convenient or who's winning, not about "
 "arguments of right or wrong.  Couldn't you get more of their support by a "
@@ -2386,15 +2390,15 @@
 "href=\"#winning\">#winning</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "To care only about what's convenient or who's winning is an amoral approach "
-"to life.  Non-free software is an example of that amoral approach and "
-"thrives on it.  Thus, in the long run it would be self-defeating for us to "
-"adopt that approach.  We will continue talking in terms of right and wrong."
+"to life.  Nonfree software is an example of that amoral approach and thrives "
+"on it.  Thus, in the long run it would be self-defeating for us to adopt "
+"that approach.  We will continue talking in terms of right and wrong."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope that you are one of those for whom right and wrong do matter."
 msgstr ""
 
@@ -2436,8 +2440,8 @@
 
 #. type: Content of: <div><p>
 msgid ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation, "
+"Inc."
 msgstr ""
 
 #. type: Content of: <div><p>

Index: gnu/po/gnu-linux-faq.pt-br.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.pt-br.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- gnu/po/gnu-linux-faq.pt-br.po       3 May 2021 15:04:17 -0000       1.22
+++ gnu/po/gnu-linux-faq.pt-br.po       30 Aug 2021 13:34:53 -0000      1.23
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-05-03 10:15-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <www-pt-br-general@gnu.org>\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Gtranslator 40.0\n"
 
@@ -25,29 +26,15 @@
 "Perguntas frequentes (FAQ) sobre GNU/Linux - Projeto GNU - Free Software "
 "Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU/Linux FAQ"
 msgstr "Perguntas frequentes (FAQ) sobre GNU/Linux"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by Richard Stallman"
 msgstr "por Richard Stallman"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
-"linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a href=\"/"
-"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Para aprender mais sobre essa questão, você também pode ler nossa página "
-"sobre <a href=\"/gnu/linux-and-gnu.html\">Linux e o Projeto GNU</a>, nossa "
-"página sobre <a href=\"/gnu/why-gnu-linux.html\">Por que GNU/Linux?</a> e "
-"nossa página sobre <a href=\"/gnu/gnu-users-never-heard-of-gnu.html"
-"\">Usuários do GNU que nunca ouviram falar do GNU</a>."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When people see that we use and recommend the name GNU/Linux for a system "
 "that many others call just &ldquo;Linux&rdquo;, they ask many questions.  "
@@ -57,6 +44,12 @@
 "um sistema que muitas outras chamam apenas “Linux”, elas fazem muitas "
 "perguntas. Aqui estão as perguntas comuns e as nossas respostas."
 
+#. type: Content of: <div><div><h3>
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "Conteúdo"
+
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<a href=\"#why\">Why do you call the system we use GNU/Linux and not Linux?</"
@@ -642,7 +635,28 @@
 "quem está ganhando, e não com argumentos de certo ou errado. Vocês não "
 "conseguiriam mais apoio delas seguindo um caminho diferente?</a>"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our page on <a href=\"/"
+#| "gnu/linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a "
+#| "href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
+"linux-and-gnu.html\">Linux and the GNU System</a>, our page on <a href=\"/"
+"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Para aprender mais sobre essa questão, você também pode ler nossa página "
+"sobre <a href=\"/gnu/linux-and-gnu.html\">Linux e o Projeto GNU</a>, nossa "
+"página sobre <a href=\"/gnu/why-gnu-linux.html\">Por que GNU/Linux?</a> e "
+"nossa página sobre <a href=\"/gnu/gnu-users-never-heard-of-gnu.html"
+"\">Usuários do GNU que nunca ouviram falar do GNU</a>."
+
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you call the system we use GNU/Linux and not Linux? <span class="
 "\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>"
@@ -650,7 +664,7 @@
 "Por que vocês chamam o sistema que usamos de GNU/Linux e não Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Most operating system distributions based on Linux as kernel are basically "
 "modified versions of the GNU operating system.  We began developing GNU in "
@@ -669,11 +683,11 @@
 "centrais, formando a maior contribuição única para todo o sistema. A 
visão "
 "básica também era nossa."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "In fairness, we ought to get at least equal mention."
 msgstr "De forma justa, devemos ter, pelo menos, uma menção mínima."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and the GNU System</a> and <a "
 "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
@@ -685,7 +699,7 @@
 "falar do GNU</a> para mais explicação e <a href=\"/gnu/the-gnu-project.html"
 "\">O Projeto GNU</a> para a história."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why is the name important? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
@@ -693,7 +707,7 @@
 "Por que o nome é importante? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Although the developers of Linux, the kernel, are contributing to the free "
 "software community, many of them do not care about freedom.  People who "
@@ -708,7 +722,7 @@
 "que eles realmente não participaram. Em seguida, eles dão um peso excessivo 
"
 "aos pontos de vista desses desenvolvedores."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Calling the system GNU/Linux recognizes the role that our idealism played in "
 "building our community, and <a href=\"/gnu/why-gnu-linux.html\">helps the "
@@ -719,7 +733,7 @@
 "linux.html\">ajuda o público a reconhecer a importância prática desses "
 "ideais</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the real relationship between GNU and Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#what\">#what</a>)</span>"
@@ -727,7 +741,7 @@
 "Qual a real relação entre GNU e Linux? <span class=\"anchor-reference-id\">"
 "(<a href=\"#what\">#what</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU operating system and the Linux kernel are separate software projects "
 "that do complementary jobs.  Typically they are packaged in a <a href=\"/"
@@ -738,7 +752,7 @@
 "empacotados em uma <a href=\"/distros/distros.html\">distribuição 
GNU/Linux</"
 "a> e usados em conjunto."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How did it come about that most people call the system &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
@@ -748,7 +762,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; is a confusion that has spread faster "
 "than the corrective information."
@@ -756,7 +770,7 @@
 "Chamar o sistema de “Linux” é uma confusão que se espalhou mais 
rapidamente "
 "do que a informação corretiva."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who combined Linux with the GNU system were not aware that that's "
 "what their activity amounted to.  They focused their attention on the piece "
@@ -774,7 +788,7 @@
 "problemático isso era e pedimos às pessoas que corrigissem a prática. Até 
"
 "então, a confusão teve uma grande vantagem."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the people who call the system &ldquo;Linux&rdquo; have never heard "
 "why that's not the right thing.  They saw others using that name and assume "
@@ -793,7 +807,7 @@
 "Essa imagem falsa tende a reforçar a ideia de que o sistema deveria ser "
 "chamado de “Linux”."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Many of the questions in this file represent people's attempts to justify "
 "the name they are accustomed to using."
@@ -801,7 +815,7 @@
 "Muitas das perguntas neste arquivo representam as tentativas das pessoas de "
 "justificar o nome que estão acostumados a usar."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we always say &ldquo;GNU/Linux&rdquo; instead of &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
@@ -809,7 +823,7 @@
 "Devemos sempre dizer “GNU/Linux” em vez de “Linux”? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not always&mdash;only when you're talking about the whole system.  When "
 "you're referring specifically to the kernel, you should call it &ldquo;"
@@ -819,7 +833,7 @@
 "Quando você está se referindo especificamente ao kernel, você deve 
chamá-lo "
 "“Linux”, o nome que seu desenvolvedor escolheu."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
 "call the whole system by the same name as the kernel.  This causes many "
@@ -834,7 +848,7 @@
 "sobre o kernel ou todo o sistema. Ao chamar todo o sistema “GNU/Linux” e "
 "chamar o kernel de “Linux”, evita-se a ambiguidade."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Would Linux have achieved the same success if there had been no GNU? <span "
 "class=\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</"
@@ -843,7 +857,7 @@
 "Linux teria alcançado o mesmo sucesso se não existisse GNU? <span class="
 "\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In that alternative world, there would be nothing today like the GNU/Linux "
 "system, and probably no free operating system at all.  No one attempted to "
@@ -857,7 +871,7 @@
 "tarde) Berkeley CSRG, ao qual o Projeto GNU solicitou especificamente para "
 "começassem a liberar seu código."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds was partly influenced by a speech about GNU in Finland in "
 "1990.  It's possible that even without this influence he might have written "
@@ -871,7 +885,7 @@
 "software livre. O Linux tornou-se livre em 1992, quando Linus relançou-o sob 
"
 "a GNU GPL. (Veja as notas de lançamento para a versão 0.12.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Even if Torvalds had released Linux under some other free software license, "
 "a free kernel alone would not have made much difference to the world.  The "
@@ -883,7 +897,7 @@
 "mundo. O significado do Linux veio de encaixar em uma estrutura maior, um "
 "sistema operacional livre e completo: o GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better for the community if you did not divide people with "
 "this request? <span class=\"anchor-reference-id\">(<a href=\"#divide"
@@ -893,7 +907,7 @@
 "esse pedido? <span class=\"anchor-reference-id\">(<a href=\"#divide"
 "\">#divide</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
 "people.  We are asking them to give the GNU Project credit for the GNU "
@@ -903,7 +917,7 @@
 "pessoas. Pedimos que dê o crédito do Projeto GNU para o sistema operacional 
"
 "GNU. Isso não critica ninguém nem empurra ninguém."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, there are people who do not like our saying this.  Sometimes those "
 "people push us away in response.  On occasion they are so rude that one "
@@ -917,7 +931,7 @@
 "Não nos silencia, mas tende a dividir a comunidade, então esperamos que 
você "
 "possa convencê-los a parar."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, this is only a secondary cause of division in our community.  The "
 "largest division in the community is between people who appreciate free "
@@ -934,7 +948,7 @@
 "apenas como um eficiente modelo de desenvolvimento (o movimento de código "
 "aberto)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This disagreement is not just a matter of names&mdash;it is a matter of "
 "differing basic values.  It is essential for the community to see and think "
@@ -950,7 +964,7 @@
 "href=\"/philosophy/open-source-misses-the-point.html\">Por que o código "
 "aberto não compartilha dos objetivos do software livre</a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The disagreement over values partially aligns with the amount of attention "
 "people pay to the GNU Project's role in our community.  People who value "
@@ -975,7 +989,7 @@
 "nós, que valorizamos a liberdade, persuadirmos a todos (o que não será "
 "fácil) ou sermos totalmente derrotados (esperemos que não)."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Doesn't the GNU project support an individual's free speech rights to call "
 "the system by any name that individual chooses? <span class=\"anchor-"
@@ -985,7 +999,7 @@
 "de chamar o sistema pelo nome que esse indivíduo escolher? <span class="
 "\"anchor-reference-id\">(<a href=\"#freespeech\">#freespeech</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Yes, indeed, we believe you have a free speech right to call the operating "
 "system by any name you wish.  We ask that people call it GNU/Linux as a "
@@ -1000,7 +1014,7 @@
 "para informar aos outros que esses valores de liberdade trouxeram o sistema "
 "à existência."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since everyone knows the role of GNU in developing the system, doesn't the "
 "&ldquo;GNU/&rdquo; in the name go without saying? <span class=\"anchor-"
@@ -1010,7 +1024,7 @@
 "“GNU/” no nome não estaria implícito? <span 
class=\"anchor-reference-id\">"
 "(<a href=\"#everyoneknows\">#everyoneknows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Experience shows that the system's users, and the computer-using public in "
 "general, often know nothing about the GNU system.  Most articles about the "
@@ -1024,7 +1038,7 @@
 "que o GNU representa. <a href=\"/gnu/gnu-users-never-heard-of-gnu.html"
 "\">Usuários do GNU que nunca ouviram falar do GNU</a> explica ainda mais."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who say this are probably geeks thinking of the geeks they know.  "
 "Geeks often do know about GNU, but many have a completely wrong idea of what "
@@ -1037,7 +1051,7 @@
 "exemplo, muitos pensam que é uma coleção de <a href=\"#tools"
 "\">“ferramentas”</a> ou um projeto para desenvolver ferramentas."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The wording of this question, which is typical, illustrates another common "
 "misconception.  To speak of &ldquo;GNU's role&rdquo; in developing something "
@@ -1050,7 +1064,7 @@
 "pessoas. O GNU é um sistema operacional. Seria sensato falar sobre o papel "
 "do Projeto GNU nessa ou em alguma outra atividade, mas não em GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since I know the role of GNU in this system, why does it matter what name I "
 "use? <span class=\"anchor-reference-id\">(<a href="
@@ -1060,7 +1074,7 @@
 "uso? <span class=\"anchor-reference-id\">(<a href="
 "\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your words don't reflect your knowledge, you don't teach others.  Most "
 "people who have heard of the GNU/Linux system think it is &ldquo;"
@@ -1072,7 +1086,7 @@
 "“Linux”, que foi iniciado por Linus Torvalds, e que se destinava a ser "
 "“código aberto”. Se você não disser a eles, quem vai?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't shortening &ldquo;GNU/Linux&rdquo; to &ldquo;Linux&rdquo; just like "
 "shortening &ldquo;Microsoft Windows&rdquo; to &ldquo;Windows&rdquo;? <span "
@@ -1082,7 +1096,7 @@
 "Windows” para “Windows”? <span class=\"anchor-reference-id\">(<a href="
 "\"#windows\">#windows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It's useful to shorten a frequently-used name, but not if the abbreviation "
 "is misleading."
@@ -1090,7 +1104,7 @@
 "É útil encurtar um nome usado com frequência, mas não se a abreviatura é 
"
 "enganosa."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Almost everyone in developed countries really does know that the &ldquo;"
 "Windows&rdquo; system is made by Microsoft, so shortening &ldquo;Microsoft "
@@ -1103,7 +1117,7 @@
 "“Windows” não engana ninguém quanto à natureza e origem desse sistema. 
"
 "Encurtar “GNU/Linux” para “Linux” dá a ideia errada de onde o 
sistema vem."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The question is itself misleading because GNU and Microsoft are not the same "
 "kind of thing.  Microsoft is a company; GNU is an operating system."
@@ -1111,7 +1125,7 @@
 "A pergunta em si é enganosa porque o GNU e a Microsoft não são o mesmo 
tipo "
 "de coisa. A Microsoft é uma empresa; O GNU é um sistema operacional."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't GNU a collection of programming tools that were included in Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
@@ -1120,7 +1134,7 @@
 "Linux? <span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "People who think that Linux is an entire operating system, if they hear "
 "about GNU at all, often get a wrong idea of what GNU is.  They may think "
@@ -1139,7 +1153,7 @@
 "em uma estrutura conceitual na qual esse sistema operacional é rotulado como 
"
 "“Linux”."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Project was named after the GNU operating system&mdash;it's the "
 "project to develop the GNU system.  (See <a href=\"/gnu/initial-announcement."
@@ -1149,7 +1163,7 @@
 "projeto para desenvolver o sistema GNU. (Veja <a href=\"/gnu/initial-"
 "announcement.html\">o anúncio inicial de 1983</a>.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We developed programs such as GCC, GNU Emacs, GAS, GLIBC, BASH, etc., "
 "because we needed them for the GNU operating system.  GCC, the GNU Compiler "
@@ -1163,7 +1177,7 @@
 "Nós, muitas pessoas que trabalhamos no Projeto GNU, desenvolvemos "
 "Ghostscript, GNUCash, GNU Chess e GNOME para o sistema GNU também."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the difference between an operating system and a kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
@@ -1171,7 +1185,7 @@
 "Qual é a diferença entre um sistema operacional e um kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "An operating system, as we use the term, means a collection of programs that "
 "are sufficient to use the computer to do a wide variety of jobs.  A general "
@@ -1184,7 +1198,7 @@
 "completo, deve lidar com todos os trabalhos que muitos usuários podem querer 
"
 "fazer."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The kernel is one of the programs in an operating system&mdash;the program "
 "that allocates the machine's resources to the other programs that are "
@@ -1194,7 +1208,7 @@
 "aloca os recursos da máquina para os outros programas que estão sendo "
 "executados. O kernel também cuida de iniciar e parar outros programas."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "To confuse matters, some people use the term &ldquo;operating system&rdquo; "
 "to mean &ldquo;kernel&rdquo;.  Both uses of the term go back many years.  "
@@ -1214,7 +1228,7 @@
 "inclusive. Como pretendíamos que o GNU fosse um sistema operacional similar "
 "ao Unix, usamos o termo “sistema operacional” do mesmo jeito."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the time when people speak of the &ldquo;Linux operating "
 "system&rdquo; they are using &ldquo;operating system&rdquo; in the same "
@@ -1231,7 +1245,7 @@
 "“Linux” é o nome certo para isso, mas diga “kernel” também para 
evitar a "
 "ambiguidade sobre qual corpo de software você quer dizer."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
@@ -1242,7 +1256,7 @@
 "toda a coleção de programas, em vez de “sistema operacional”, está 
tudo bem. "
 "Então, você falaria sobre as distribuições do sistema GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The kernel of a system is like the foundation of a house.  How can a house "
 "be almost complete when it doesn't have a foundation? <span class=\"anchor-"
@@ -1252,7 +1266,7 @@
 "quase completa quando ela não tem uma fundação? <span class=\"anchor-"
 "reference-id\">(<a href=\"#house\">#house</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "A kernel is not much like the foundation of a house because building an "
 "operating system is not much like building a house."
@@ -1260,7 +1274,7 @@
 "Um kernel não é muito parecido com a fundação de uma casa porque 
construir "
 "um sistema operacional não é como construir uma casa."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A house is built from lots of little general parts that are cut and put "
 "together in situ.  They have to be put together from the bottom up.  Thus, "
@@ -1272,7 +1286,7 @@
 "Assim, quando a fundação não foi construída, nenhuma parte substancial 
foi "
 "construída; tudo que você tem é um buraco no chão."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "By contrast, an operating system consists of complex components that can be "
 "developed in any order.  When you have developed most of the components, "
@@ -1288,7 +1302,7 @@
 "maioria dos módulos da Estação Espacial estiverem em órbita, mas 
aguardando "
 "um outro módulo essencial, isso seria como o sistema GNU em 1992."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't the kernel the brain of the system? <span class=\"anchor-reference-id"
 "\">(<a href=\"#brain\">#brain</a>)</span>"
@@ -1296,7 +1310,7 @@
 "O kernel não é o cérebro do sistema? <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#brain\">#brain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A computer system is not much like a human body, and no part of it plays a "
 "role comparable to that of the brain in a human."
@@ -1304,7 +1318,7 @@
 "Um sistema de computador não é muito parecido com um corpo humano e nenhuma 
"
 "parte dele desempenha um papel comparável ao do cérebro em um ser humano."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't writing the kernel most of the work in an operating system? <span "
 "class=\"anchor-reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</"
@@ -1314,11 +1328,11 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "No, many components take a lot of work."
 msgstr "Não, muitos componentes exigem muito trabalho."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "An operating system requires a kernel.  Since the GNU Project didn't develop "
 "a kernel, how can the system be GNU?<span class=\"anchor-reference-id\">(<a "
@@ -1328,7 +1342,7 @@
 "desenvolveu um kernel, como o sistema pode ser GNU?<span class=\"anchor-"
 "reference-id\">(<a href=\"#nokernel\">#nokernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The people who argue that way for calling the system &ldquo;Linux&rdquo; are "
 "using a double standard.  An operating system requires compilers, editors, "
@@ -1342,7 +1356,7 @@
 "programas, para corresponder aos sistemas BSD incluídos em 1983. Como o "
 "Torvalds não desenvolveu nenhum deles, como o sistema pode ser “Linux”?"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "That standard is too strict, not the right way to judge the contributions of "
 "any contributor."
@@ -1350,7 +1364,7 @@
 "Esse padrão é muito rigoroso, não é o caminho certo para julgar as "
 "contribuições de qualquer colaborador."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds made an important contribution to the operating system we "
 "use; the GNU Project started earlier and contributed much more.  The name "
@@ -1360,7 +1374,7 @@
 "que usamos; o Projeto GNU começou mais cedo e contribuiu com muito mais. O "
 "nome “GNU/Linux” dá crédito a cada um."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How can GNU be an operating system, if I can't get something called &ldquo;"
 "GNU&rdquo; and install it? <span class=\"anchor-reference-id\">(<a href="
@@ -1370,7 +1384,7 @@
 "coisa chamada “GNU” e instalá-la? <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#notinstallable\">#notinstallable</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Many <a href=\"/distros/distros.html\"> packaged and installable versions of "
 "GNU</a> are available.  None of them is called simply &ldquo;GNU&rdquo;, but "
@@ -1380,7 +1394,7 @@
 "do GNU</a> estão disponíveis. Nenhuma delas é chamada simplesmente de 
“GNU”, "
 "mas o GNU é o que elas basicamente são."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We expected to release the GNU system packaged for installation, but this "
 "plan was overtaken by events: in 1992 others were already packaging GNU "
@@ -1400,7 +1414,7 @@
 "apenas “GNU” porque esse seria o nome de uma versão do sistema com o 
kernel "
 "GNU Hurd &ndash; que ainda não estava pronto."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Hurd kernel never became sufficiently ready; we only recommend it to "
 "those interested in working on it.  So we never packaged GNU with the GNU "
@@ -1411,7 +1425,7 @@
 "GNU com o kernel GNU Hurd. No entanto, o Debian empacotou essa combinação "
 "como Debian GNU/Hurd."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are now developing an advanced Scheme-based package manager called Guix "
 "and a complete system distribution based on it called the <a href=\"/"
@@ -1424,7 +1438,7 @@
 "GuixSD. Isso inclui o reempacotamento de uma parte substancial do sistema "
 "GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We never took the last step of packaging GNU under the name &ldquo;"
 "GNU&rdquo;, but that doesn't alter what kind of thing GNU is.  GNU is an "
@@ -1433,7 +1447,7 @@
 "Nós nunca demos o último passo de empacotar GNU sob o nome “GNU”, mas 
isso "
 "não altera o tipo de coisa que é o GNU. O GNU é um sistema operacional."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "We're calling the whole system after the kernel, Linux.  Isn't it normal to "
 "name an operating system after a kernel? <span class=\"anchor-reference-id\">"
@@ -1443,7 +1457,7 @@
 "sistema operacional pelo kernel? <span class=\"anchor-reference-id\">(<a "
 "href=\"#afterkernel\">#afterkernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "That practice seems to be very rare&mdash;we can't find any examples other "
 "than the misuse of the name &ldquo;Linux&rdquo;.  Normally an operating "
@@ -1459,7 +1473,7 @@
 "geralmente não tem um nome próprio &ndash; em vez disso, as pessoas dizem 
“o "
 "kernel de tal e tal” ou “o kernel tal e tal”."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Because those two constructions are used synonymously, the expression &ldquo;"
 "the Linux kernel&rdquo; can easily be misunderstood as meaning &ldquo;the "
@@ -1473,7 +1487,7 @@
 "kernel. Você pode evitar a possibilidade desse mal-entendido dizendo ou "
 "escrevendo “o kernel, Linux” ou “Linux, o kernel”."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can another system have &ldquo;the feel of Linux&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
@@ -1481,7 +1495,7 @@
 "Outro sistema pode ter “a cara do Linux”? <span 
class=\"anchor-reference-id"
 "\">(<a href=\"#feel\">#feel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is no such thing as the &ldquo;feel of Linux&rdquo; because Linux has "
 "no user interfaces.  Like any modern kernel, Linux is a base for running "
@@ -1495,7 +1509,7 @@
 "interação humana com o GNU/Linux sempre passa por outros programas e a "
 "“cara” vem deles."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  How about "
 "recommending a shorter name? <span class=\"anchor-reference-id\">(<a href="
@@ -1505,7 +1519,7 @@
 "nome mais curto? <span class=\"anchor-reference-id\">(<a href=\"#long"
 "\">#long</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "For a while we tried the name &ldquo;LiGNUx&rdquo;, which combines the words "
 "&ldquo;GNU&rdquo; and &ldquo;Linux&rdquo;.  The reaction was very bad.  "
@@ -1515,7 +1529,7 @@
 "“Linux”. A reação foi muito ruim. As pessoas aceitam “GNU/Linux” 
muito "
 "melhor."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
 "call it &ldquo;GNU/Linux&rdquo; <a href=\"#justgnu\"> for the reasons given "
@@ -1524,7 +1538,7 @@
 "O nome legítimo mais curto para este sistema é o “GNU”, mas nós o 
chamamos "
 "“GNU/Linux” <a href=\"#justgnu\"> pelos motivos apresentados abaixo</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How about calling the system &ldquo;GliNUx&rdquo; (instead of &ldquo;GNU/"
 "Linux&rdquo;)? <span class=\"anchor-reference-id\">(<a href="
@@ -1533,7 +1547,7 @@
 "Que tal chamar o sistema de “GliNUx” (em vez de “GNU/Linux”)? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#long1\">#long1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The name &ldquo;GNU&rdquo; does not visibly appear in &ldquo;Glinux,&rdquo; "
 "so most people would not notice it is there.  Even if it is capitalized as "
@@ -1545,7 +1559,7 @@
 "maiúsculas como “GliNUx”, a maioria das pessoas não perceberia que 
contém "
 "uma referência ao GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be comparable to writing &ldquo;GNU/Linux,&rdquo; but putting "
 "&ldquo;GNU/&rdquo; in print so small that most people could not read it."
@@ -1553,7 +1567,7 @@
 "Seria comparável à escrita “GNU/Linux”, mas colocar “GNU/” numa 
impressão "
 "tão pequena que a maioria das pessoas não pudesse lê-lo."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  Why should "
 "I go to the trouble of saying &ldquo;GNU/&rdquo;? <span class=\"anchor-"
@@ -1563,7 +1577,7 @@
 "dar o trabalho de dizer “GNU/”? <span class=\"anchor-reference-id\">(<a 
href="
 "\"#long2\">#long2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
 "the system that we developed, can't you take one second to recognize our "
@@ -1573,7 +1587,7 @@
 "desenvolvemos, você não pode demorar um segundo para reconhecer nosso "
 "trabalho?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Unfortunately, &ldquo;GNU/Linux&rdquo; is five syllables. People won't use "
 "such a long term. Shouldn't you find a shorter one? <span class=\"anchor-"
@@ -1583,7 +1597,7 @@
 "tão longo. Vocês não deveriam achar um mais curto? <span class=\"anchor-"
 "reference-id\">(<a href=\"#long3\">#long3</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, &ldquo;GNU/Linux&rdquo; is only four syllables.  &ldquo;"
 "Unfortunately&rdquo; is five syllables, yet people show no sign of "
@@ -1593,7 +1607,7 @@
 "cinco sílabas, mas as pessoas não mostram sinais de relutância em usar 
essa "
 "palavra."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Stallman doesn't ask us to call him &ldquo;Richard Matthew Stallman&rdquo; "
 "every the time.  So why ask us to say &ldquo;GNU/Linux&rdquo; every time? "
@@ -1603,7 +1617,7 @@
 "todo. Então, por que nos pedir para dizer “GNU/Linux” toda vez? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#long4\">#long4</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Omitting &ldquo;Matthew&rdquo; does not misrepresent anything important "
 "about Stallman's nature, origin, ideas or purpose.  Omitting &ldquo;"
@@ -1613,7 +1627,7 @@
 "ideias ou propósito de Stallman. Omitir “GNU” deturpa essas coisas sobre 
o "
 "sistema GNU/Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is an example of a frequent way of hiding a fallacy: to bury it inside "
 "a misleading analogy.  A better analogy would be, &ldquo;Why shouldn't we "
@@ -1623,7 +1637,7 @@
 "la dentro de uma analogia enganosa. Uma analogia melhor seria: “Por que 
não "
 "devemos chamar Stallman de ‘Torvalds’?”"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since Linux is a secondary contribution, would it be false to the facts to "
 "call the system simply &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id"
@@ -1633,7 +1647,7 @@
 "apenas de “GNU”? <span class=\"anchor-reference-id\">(<a href=\"#justgnu"
 "\">#justgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would not be false to the facts, but it is not the best thing to do.  "
 "Here are the reasons we call that system version &ldquo;GNU/Linux&rdquo; "
@@ -1643,7 +1657,7 @@
 "motivos pelos quais chamamos aquela versão de sistema de “GNU/Linux” em 
vez "
 "de apenas “GNU”:"
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It's not exactly GNU&mdash;it has a different kernel (that is, Linux).  "
 "Distinguishing GNU/Linux from GNU is useful."
@@ -1651,7 +1665,7 @@
 "Não é exatamente o GNU &ndash; tem um kernel diferente (isto é, Linux). "
 "Distinguir o GNU/Linux do GNU é útil."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It would be ungentlemanly to ask people to <em>stop</em> giving any credit "
 "to Linus Torvalds.  He did write an important component of the system.  We "
@@ -1671,7 +1685,7 @@
 "aberta, em vez de tentar lhe retirar o crédito por sua contribuição para o 
"
 "sistema."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
 "&ldquo;GNU&rdquo; they may simply not recognize we're talking about the same "
@@ -1683,7 +1697,7 @@
 "Se dissermos “GNU/Linux”, eles podem fazer uma conexão com o que ouviram 
"
 "falar."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "I would have to pay a fee if I use &ldquo;Linux&rdquo; in the name of a "
 "product, and that would also apply if I say &ldquo;GNU/Linux&rdquo;.  Is it "
@@ -1696,7 +1710,7 @@
 "“GNU” sem “Linux”, para economizar na taxa? <span 
class=\"anchor-reference-id"
 "\">(<a href=\"#trademarkfee\">#trademarkfee</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There's nothing wrong in calling the system &ldquo;GNU&rdquo;; basically, "
 "that's what it is.  It is nice to give Linus Torvalds a share of the credit "
@@ -1706,7 +1720,7 @@
 "ele é. É bom dar a Linus Torvalds uma parte do crédito também, mas você 
não "
 "tem obrigação de pagar o privilégio de fazê-lo."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "So if you want to refer to the system simply as &ldquo;GNU&rdquo;, to avoid "
 "paying the fee for calling it &ldquo;Linux&rdquo;, we won't criticize you."
@@ -1714,7 +1728,7 @@
 "Então, se você quiser se referir ao sistema simplesmente como “GNU”, 
para "
 "evitar pagar a taxa por chamá-lo “Linux”, não lhe criticaremos."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today; it includes "
 "TeX, X11, Apache, Perl, and many more programs.  Don't your arguments imply "
@@ -1728,7 +1742,7 @@
 "tão longo que é absurdo.) <span class=\"anchor-reference-id\">(<a href="
 "\"#many\">#many</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "What we say is that you ought to give the system's principal developer a "
 "share of the credit.  The principal developer is the GNU Project, and the "
@@ -1738,7 +1752,7 @@
 "parcela do crédito. O desenvolvedor principal é o Projeto GNU, e o sistema 
é "
 "basicamente o GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you feel even more strongly about giving credit where it is due, you "
 "might feel that some secondary contributors also deserve credit in the "
@@ -1755,7 +1769,7 @@
 "simplesmente grita por menção e você deseja escrever GNU/Linux/Perl, vá 
em "
 "frente."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Since a long name such as GNU/X11/Apache/Linux/TeX/Perl/Python/FreeCiv "
 "becomes absurd, at some point you will have to set a threshold and omit the "
@@ -1769,7 +1783,7 @@
 "certo para definir o limiar, então, onde quer que o estabeleça, não "
 "discutiremos contra isso."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Different threshold levels would lead to different choices of name for the "
 "system.  But one name that cannot result from concerns of fairness and "
@@ -1783,7 +1797,7 @@
 "justo dar todo o crédito a uma contribuição secundária (Linux) ao mesmo "
 "tempo que omite a contribuição principal (GNU)."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "systemd plays an important role in the GNU/Linux system as it is today; are "
 "we obligated to call it GNU/systemd/Linux? <span class=\"anchor-reference-id"
@@ -1793,7 +1807,7 @@
 "somos obrigados a chamá-lo GNU/systemd/Linux?<span class=\"anchor-reference-"
 "id\">(<a href=\"#others\">#others</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "systemd is a fairly important component, but not as important as the kernel "
 "(Linux), nor as important as the basis of the system as a whole (GNU).  "
@@ -1805,7 +1819,7 @@
 "(GNU). No entanto, se você deseja enfatizar a presença do systemd chamando 
o "
 "sistema “GNU/systemd/Linux”, não há nada de errado em fazer isso."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today, but they don't "
 "insist on calling it XYZ/Linux.  Why should we treat GNU specially? <span "
@@ -1816,7 +1830,7 @@
 "forma especial? <span class=\"anchor-reference-id\">(<a href=\"#others"
 "\">#others</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Thousands of projects have developed programs commonly included in today's "
 "GNU/Linux systems.  They all deserve credit for their contributions, but "
@@ -1828,7 +1842,7 @@
 "mas não são os principais desenvolvedores do sistema como um todo, então "
 "eles não pedem para ser creditado como tal."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is different because it is more than just a contributed program, more "
 "than just a collection of contributed programs.  GNU is the framework on "
@@ -1838,7 +1852,7 @@
 "do que apenas uma coleção de programas contribuídos. O GNU é o quadro em 
que "
 "o sistema foi criado."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "GNU is a small fraction of the system nowadays, so why should we mention it? "
 "<span class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</"
@@ -1848,7 +1862,7 @@
 "mencioná-lo? <span class=\"anchor-reference-id\">(<a href=\"#allsmall"
 "\">#allsmall</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In 2008, we found that GNU packages made up 15% of the &ldquo;main&rdquo; "
 "repository of the gNewSense GNU/Linux distribution.  Linux made up 1.5%.  So "
@@ -1859,7 +1873,7 @@
 "“main” da distribuição gNewSense GNU/Linux. O Linux constituiu 1,5%. 
Então, "
 "o mesmo argumento se aplicaria ainda mais fortemente para chamá-lo 
“Linux”."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is a small fraction of the system nowadays, and Linux is an even smaller "
 "fraction.  But they are the system's core; the system was made by combining "
@@ -1869,7 +1883,7 @@
 "ainda menor. Mas eles são o kernel do sistema; o sistema foi feito "
 "combinando-os. Assim, o nome “GNU/Linux” permanece apropriado."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many companies contributed to the system as it is today; doesn't that mean "
 "we ought to call it GNU/Red&nbsp;Hat/Novell/Linux? <span class=\"anchor-"
@@ -1880,7 +1894,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#manycompanies\">#manycompanies</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is not comparable to Red Hat or Novell; it is not a company, or an "
 "organization, or even an activity.  GNU is an operating system.  (When we "
@@ -1894,7 +1908,7 @@
 "sistema GNU). O sistema GNU/Linux é baseado no GNU e é por isso que o GNU "
 "deve aparecer em seu nome."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Much of those companies' contribution to the GNU/Linux system lies in the "
 "code they have contributed to various GNU packages including GCC and GNOME.  "
@@ -1906,7 +1920,7 @@
 "Dizer que o GNU/Linux dá crédito a essas empresas, juntamente com todo o "
 "resto dos desenvolvedores do GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
@@ -1915,7 +1929,7 @@
 "Por que vocês escrevem “GNU/Linux” em vez de “GNU Linux”? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean "
@@ -1927,7 +1941,7 @@
 "é um pacote GNU”. Nenhum desses significados se encaixa na situação em "
 "questão."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is not a GNU package; that is, it wasn't developed under the GNU "
 "Project's aegis or contributed specifically to the GNU Project.  Linus "
@@ -1939,14 +1953,24 @@
 "escreveu Linux independentemente, como seu próprio projeto. Então, o "
 "significado de “Linux, que é um pacote GNU” não está certo."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "We're not talking about a distinct GNU version of Linux, the kernel.  The "
+#| "free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/";
+#| "project/linux\">separate version of Linux</a>, since the &ldquo;"
+#| "standard&rdquo; version contains non-free firmware &ldquo;blobs&rdquo;.  "
+#| "If this were part of the GNU Project, it could be considered &ldquo;GNU "
+#| "Linux&rdquo;; but we would not want to call it that, because it would be "
+#| "too confusing."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
-"free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/project/";
-"linux\">separate version of Linux</a>, since the &ldquo;standard&rdquo; "
-"version contains non-free firmware &ldquo;blobs&rdquo;.  If this were part "
-"of the GNU Project, it could be considered &ldquo;GNU Linux&rdquo;; but we "
-"would not want to call it that, because it would be too confusing."
+"free GNU/Linux distros do have a <a href=\"https://directory.fsf.org/wiki/";
+"Linux-libre\">separate version of Linux</a>, since the &ldquo;"
+"standard&rdquo; version contains nonfree firmware &ldquo;blobs&rdquo;.  If "
+"this were part of the GNU Project, it could be considered &ldquo;GNU "
+"Linux&rdquo;; but we would not want to call it that, because it would be too "
+"confusing."
 msgstr ""
 "Não estamos falando sobre uma versão GNU do Linux, o kernel. As distros 
GNU/"
 "Linux livres têm uma <a href=\"http://directory.fsf.org/project/linux";
@@ -1955,7 +1979,7 @@
 "ser considerado “GNU Linux”; mas não gostaríamos de chamá-lo assim, 
porque "
 "seria muito confuso."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We're talking about a version of GNU, the operating system, distinguished by "
 "having Linux as the kernel.  A slash fits the situation because it means "
@@ -1967,7 +1991,7 @@
 "significa “combinação”. (Pense em “Entrada/Saída”.) Este sistema 
é a "
 "combinação de GNU e Linux; daí, “GNU/Linux”."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are other ways to express &ldquo;combination&rdquo;.  If you think "
 "that a plus-sign is clearer, please use that.  In French, a hyphen is clear: "
@@ -1978,7 +2002,7 @@
 "de mais é mais claro, use isso. Em francês, um hífen é claro: 
“GNU-Linux”. "
 "Em espanhol, às vezes dizemos: “GNU con Linux”."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How is the name &ldquo;GNU/Linux&rdquo; pronounced? <span class=\"anchor-"
 "reference-id\">(<a href=\"#pronounce\">#pronounce</a>)</span>"
@@ -1986,7 +2010,7 @@
 "Como o nome “GNU/Linux” é pronunciado? <span 
class=\"anchor-reference-id\">"
 "(<a href=\"#pronounce\">#pronounce</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please pronounce it as &ldquo;GNU slash Linux.&rdquo; If you don't pronounce "
 "the slash, people will think you are saying &ldquo;GNU Linux,&rdquo; which "
@@ -1996,7 +2020,7 @@
 "barra, as pessoas pensam que você está dizendo “GNU Linux”, que <a 
href="
 "\"#whyslash\">não é um nome adequado para a combinação</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU Emacs&rdquo; rather than &ldquo;GNU/"
 "Emacs&rdquo;? <span class=\"anchor-reference-id\">(<a href=\"#whynoslash"
@@ -2005,7 +2029,7 @@
 "Por que vocês escrevem “GNU Emcas” em vez de “GNU/Emacs”? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#whynoslash\">#whynoslash</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Emacs&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Emacs&rdquo;.  That is the right "
@@ -2015,7 +2039,7 @@
 "modifica “Emacs”. Esta é a forma correta de descrever um programa 
chamado "
 "Emacs que é um pacote GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;GNU/Emacs&rdquo; would mean the combination of GNU, the operating "
 "system, and the program Emacs.  That doesn't fit this program, so &ldquo;GNU/"
@@ -2025,7 +2049,7 @@
 "programa Emacs. Isso não se encaixa nesse programa, então “GNU/Emacs” 
é a "
 "maneira errada de se referir a ele."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why &ldquo;GNU/Linux&rdquo; rather than &ldquo;Linux/GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
@@ -2033,7 +2057,7 @@
 "Por que “GNU/Linux” em vez de “Linux/GNU”? <span 
class=\"anchor-reference-id"
 "\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is right and proper to mention the principal contribution first.  The GNU "
 "contribution to the system is not only bigger than Linux and prior to Linux, "
@@ -2043,7 +2067,7 @@
 "contribuição do GNU para o sistema não é apenas maior que o Linux e antes 
do "
 "Linux, nós realmente iniciamos toda a atividade."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the lowest "
 "level of the system and GNU fills technically higher levels."
@@ -2051,7 +2075,7 @@
 "Além disso, “GNU/Linux” cabe no fato de que o Linux é o nível mais 
baixo do "
 "sistema e que o GNU preenche níveis tecnicamente mais altos."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
 "lot better than what people usually do, which is to omit GNU entirely and "
@@ -2061,7 +2085,7 @@
 "melhor do que as pessoas costumam fazer, o que é omitir o GNU inteiramente e 
"
 "fazer parecer que todo o sistema é o Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
 "say anything about what the system consists of.  Why shouldn't they call it "
@@ -2073,7 +2097,7 @@
 "forma como eles querem? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames0\">#distronames0</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling a system &ldquo;Foobar Linux&rdquo; implies that it's a flavor of "
 "&ldquo;Linux,&rdquo; and people <a href=\"#distronames\">understand it that "
@@ -2082,7 +2106,7 @@
 "Chamar um sistema de “Foobar Linux” sugere que é um sabor de “Linux” 
e as "
 "pessoas <a href=\"#distronames\">entendem dessa forma</a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If they called a GNU/Linux distro &ldquo;Foobar BSD,&rdquo; you would call "
 "that a mistake.  &ldquo;This system is not BSD,&rdquo; you would tell them.  "
@@ -2092,7 +2116,7 @@
 "isso de erro. “Este sistema não é BSD”, Você diria a eles. Bem, 
também não é "
 "o Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro is called &ldquo;Foobar Linux&rdquo;; doesn't that show it's "
 "really Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
@@ -2102,7 +2126,7 @@
 "Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
 "\">#distronames</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It means that the people who make the &ldquo;Foobar Linux&rdquo; distro are "
 "repeating the common mistake. We appreciate that distributions like Debian, "
@@ -2116,7 +2140,7 @@
 "oficial, e esperamos que, se você estiver envolvido com uma distribuição "
 "diferente, você irá incentivá-lo a fazer o mesmo."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's official name is &ldquo;Foobar Linux&rdquo;; isn't it wrong to "
 "call the distro anything but &ldquo;Foobar Linux&rdquo;? <span class="
@@ -2126,7 +2150,7 @@
 "qualquer outra coisa além de “Foobar Linux”? <span 
class=\"anchor-reference-"
 "id\">(<a href=\"#distronames1\">#distronames1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When they spread misinformation by changing &ldquo;GNU&rdquo; to &ldquo;"
 "Linux&rdquo;, and call their version of it &ldquo;Foobar Linux&rdquo;, it's "
@@ -2137,7 +2161,7 @@
 "sua versão de “Foobar Linux”, é apropriado você corrigir a 
desinformação ao "
 "chamá-la de “Foobar GNU/Linux”."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be more effective to ask companies such as Mandrake, Red Hat and "
 "IBM to call their distributions &ldquo;GNU/Linux&rdquo; rather than asking "
@@ -2149,7 +2173,7 @@
 "indivíduos? <span class=\"anchor-reference-id\">(<a href=\"#companies"
 "\">#companies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It isn't a choice of one or the other&mdash;we ask companies and "
 "organizations and individuals to help spread the word about this.  In fact, "
@@ -2167,7 +2191,7 @@
 "mais dinheiro chamando-o de “Linux”. Em outras palavras, essa empresa 
não se "
 "importava com o que estava certo."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We can't make them do this right, but we're not the sort to give up just "
 "because the road isn't easy.  You may not have as much influence at your "
@@ -2181,7 +2205,7 @@
 "mudar a situação até o ponto em que as empresas ganharão mais lucro 
chamando-"
 "a “GNU/Linux”."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to reserve the name &ldquo;GNU/Linux&rdquo; for "
 "distributions that are purely free software? After all, that is the ideal of "
@@ -2192,15 +2216,26 @@
 "puramente software livre? Afinal das contas, esse é o ideal do GNU. <span "
 "class=\"anchor-reference-id\">(<a href=\"#reserve\">#reserve</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+#, fuzzy
+#| msgid ""
+#| "The widespread practice of adding non-free software to the GNU/Linux "
+#| "system is a major problem for our community.  It teaches the users that "
+#| "non-free software is ok, and that using it is part of the spirit of "
+#| "&ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part "
+#| "of their mission to help users use non-free add-ons, and may even invite "
+#| "salesmen to come and make sales pitches for them.  They adopt goals such "
+#| "as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them "
+#| "use non-free applications and drivers), or making the system more popular "
+#| "even at the cost of freedom."
 msgid ""
-"The widespread practice of adding non-free software to the GNU/Linux system "
-"is a major problem for our community.  It teaches the users that non-free "
+"The widespread practice of adding nonfree software to the GNU/Linux system "
+"is a major problem for our community.  It teaches the users that nonfree "
 "software is ok, and that using it is part of the spirit of &ldquo;"
 "Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of their "
-"mission to help users use non-free add-ons, and may even invite salesmen to "
+"mission to help users use nonfree add-ons, and may even invite salesmen to "
 "come and make sales pitches for them.  They adopt goals such as &ldquo;"
-"helping the users&rdquo; of GNU/Linux (including helping them use non-free "
+"helping the users&rdquo; of GNU/Linux (including helping them use nonfree "
 "applications and drivers), or making the system more popular even at the "
 "cost of freedom."
 msgstr ""
@@ -2214,11 +2249,11 @@
 "drivers não livres) ou tornando o sistema mais popular mesmo ao custo da "
 "liberdade."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The question is how to try to change this."
 msgstr "A questão é como tentar mudar isso."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Given that most of the community which uses GNU with Linux already does not "
 "realize that's what it is, for us to disown these adulterated versions, "
@@ -2232,13 +2267,22 @@
 "liberdade. Eles não receberiam a mensagem pretendida. Eles só responderiam "
 "que nunca pensaram que estes sistemas eram o GNU em primeiro lugar."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The way to lead these users to see a connection with freedom is exactly "
+#| "the opposite: to inform them that all these system versions <em>are</em> "
+#| "versions of GNU, that they all are based on a system that exists "
+#| "specifically for the sake of the users' freedom.  With this "
+#| "understanding, they can start to recognize the distributions that include "
+#| "non-free software as perverted, adulterated versions of GNU, instead of "
+#| "thinking they are proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgid ""
 "The way to lead these users to see a connection with freedom is exactly the "
 "opposite: to inform them that all these system versions <em>are</em> "
 "versions of GNU, that they all are based on a system that exists "
 "specifically for the sake of the users' freedom.  With this understanding, "
-"they can start to recognize the distributions that include non-free software "
+"they can start to recognize the distributions that include nonfree software "
 "as perverted, adulterated versions of GNU, instead of thinking they are "
 "proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgstr ""
@@ -2250,7 +2294,7 @@
 "software não livre como versões falsas e adulteradas do GNU, em vez de "
 "pensar que são “versões do Linux” adequadas e apropriadas."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is very useful to start GNU/Linux User Groups, which call the system GNU/"
 "Linux and adopt the ideals of the GNU Project as a basis for their "
@@ -2268,7 +2312,7 @@
 "nos objetivos mais superficiais têm direito a seus pontos de vista, mas não 
"
 "os deixem arrastrar você!"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not make a GNU distribution of Linux (sic) and call that GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
@@ -2278,7 +2322,7 @@
 "Linux? <span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "All the &ldquo;Linux&rdquo; distributions are actually versions of the GNU "
 "system with Linux as the kernel.  The purpose of the term &ldquo;GNU/"
@@ -2291,7 +2335,7 @@
 "Desenvolver uma nova distribuição e chamá-la sozinha de “GNU/Linux” "
 "obscureceria o ponto que queremos fazer."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "As for developing a distribution of GNU/Linux, we already did this once, "
 "when we funded the early development of Debian GNU/Linux.  To do it again "
@@ -2305,7 +2349,7 @@
 "que a nova distribuição tivesse vantagens práticas substanciais em 
relação a "
 "outras distribuições, isso não servirá para nada."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Instead we help the developers of 100% free GNU/Linux distributions, such as "
 "gNewSense and Ututo."
@@ -2313,7 +2357,7 @@
 "Em vez disso, ajudamos os desenvolvedores de distribuições GNU/Linux 100% "
 "livres, como o gNewSense e o Ututo."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not just say &ldquo;Linux is the GNU kernel&rdquo; and release some "
 "existing version of GNU/Linux under the name &ldquo;GNU&rdquo;? <span class="
@@ -2323,7 +2367,7 @@
 "do GNU/Linux sob o nome de “GNU”? <span class=\"anchor-reference-id\">(<a 
"
 "href=\"#linuxgnu\">#linuxgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It might have been a good idea to adopt Linux as the GNU kernel back in "
 "1992.  If we had realized, then, how long it would take to get the GNU Hurd "
@@ -2334,7 +2378,7 @@
 "que o GNU Hurd funcionasse, talvez pudéssemos ter feito isso. (Infelizmente, 
"
 "isso é passado.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we were to take an existing version of GNU/Linux and relabel it as &ldquo;"
 "GNU&rdquo;, that would be somewhat like making a version of the GNU system "
@@ -2345,7 +2389,7 @@
 "“GNU”, isso seria um pouco como fazer uma versão do sistema GNU e "
 "rotulássemos-a de “Linux”. Isso não era certo, e não queremos agir 
assim."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Did the GNU Project condemn and oppose use of Linux in the early days? <span "
 "class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
@@ -2353,7 +2397,7 @@
 "O projeto GNU condenou e se opôs ao uso de Linux nos primeiros dias? <span "
 "class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We did not adopt Linux as our kernel, but we didn't condemn or oppose it.  "
 "In 1993 we started discussing the arrangements to sponsor the development of "
@@ -2372,7 +2416,7 @@
 "frequentemente <cite>ad hoc</cite> e não portáveis; elas precisavam ser "
 "limpadas para instalação."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who had made the changes showed little interest in cooperating "
 "with us.  One of them actually told us that he didn't care about working "
@@ -2391,7 +2435,7 @@
 "principalmente em GNU, foram o primeiro (e ainda praticamente o único) grupo 
"
 "que não estava disposto a trabalhar conosco."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It was this experience that first showed us that people were calling a "
 "version of the GNU system &ldquo;Linux&rdquo;, and that this confusion was "
@@ -2405,7 +2449,7 @@
 "Linux” é a nossa resposta a esse problema e aos outros problemas causados "
 "pelo “Linux” não é o mesmo."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why did you wait so long before asking people to use the name GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
@@ -2414,7 +2458,7 @@
 "nome GNU/Linux? <span class=\"anchor-reference-id\">(<a href=\"#wait"
 "\">#wait</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually we didn't.  We began talking privately with developers and "
 "distributors about this in 1994, and made a more public campaign in 1996.  "
@@ -2424,7 +2468,7 @@
 "desenvolvedores e distribuidores sobre isso em 1994 e fizemos uma campanha "
 "mais pública em 1996. Continuaremos enquanto for necessário."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should the GNU/<i>name</i> convention be applied to all programs that are "
 "GPL'ed? <span class=\"anchor-reference-id\">(<a href=\"#allgpled"
@@ -2434,7 +2478,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#allgpled\">#allgpled</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We never refer to individual programs as &ldquo;GNU/<i>name</i>&rdquo;.  "
 "When a program is a GNU package, we may call it &ldquo;GNU <i>name</"
@@ -2443,7 +2487,7 @@
 "Nunca nos referimos a programas individuais como “GNU/<i>nome</i>”. 
Quando "
 "um programa é um pacote GNU, podemos chamá-lo de “GNU <i>nome</i>”."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU, the operating system, is made up of many different programs.  Some of "
 "the programs in GNU were written as part of the GNU Project or specifically "
@@ -2455,7 +2499,7 @@
 "contribuíram especificamente para ele; estes são os pacotes GNU, e muitas "
 "vezes usamos o “GNU” em seus nomes."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It's up to the developers of a program to decide if they want to contribute "
 "it and make it a GNU package.  If you have developed a program and you would "
@@ -2468,7 +2512,7 @@
 "fosse um pacote GNU, escreva para <a href=\"mailto:gnu@gnu.org\";>&lt;gnu@gnu."
 "org&gt;</a>, para que possamos avaliá-lo e decidir se o queremos."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It wouldn't be fair to put the name GNU on every individual program that is "
 "released under the GPL.  If you write a program and release it under the "
@@ -2487,7 +2531,7 @@
 "independente. Se algo não for um pacote GNU, o Projeto GNU não pode levar "
 "crédito por isso, e colocar “GNU” em seu nome seria impróprio."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In contrast, we do deserve the overall credit for the GNU operating system "
 "as a whole, even though not for each and every program in it.  The system "
@@ -2499,7 +2543,7 @@
 "sistema devido à nossa determinação e persistência, a partir de 1984, 
muitos "
 "anos antes do início do Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The operating system in which Linux became popular was basically the same as "
 "the GNU operating system.  It was not entirely the same, because it had a "
@@ -2511,7 +2555,7 @@
 "tinha um kernel diferente, mas era principalmente o mesmo sistema. Era uma "
 "variante do GNU. Era o sistema GNU/Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux continues to be used primarily in derivatives of that system&mdash;in "
 "today's versions of the GNU/Linux system.  What gives these systems their "
@@ -2523,7 +2567,7 @@
 "sua identidade é GNU e Linux no centro deles, e não particularmente Linux "
 "sozinho."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since much of GNU comes from Unix, shouldn't GNU give credit to Unix by "
 "using &ldquo;Unix&rdquo; in its name? <span class=\"anchor-reference-id\">"
@@ -2533,7 +2577,7 @@
 "usando “Unix” em seu nome? <span class=\"anchor-reference-id\">(<a href="
 "\"#unix\">#unix</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Actually, none of GNU comes from Unix.  Unix was proprietary software (and "
 "still is), so using any of its code in GNU would have been illegal.  This is "
@@ -2550,7 +2594,7 @@
 "Não conseguimos copiar programas, ou mesmo partes deles, do Unix; tudo teve "
 "que ser escrito novamente."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "No code in GNU comes from Unix, but GNU is a Unix-compatible system; "
 "therefore, many of the ideas and specifications of GNU do come from Unix.  "
@@ -2564,13 +2608,22 @@
 "é Unix], é uma maneira humorística de dar crédito ao Unix por isso, 
seguindo "
 "uma tradição hacker de siglas recursivas que começaram na década de 70."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The first such recursive acronym was TINT, &ldquo;TINT Is Not "
+#| "TECO&rdquo;.  The author of TINT wrote another implementation of TECO "
+#| "(there were already many of them, for various systems), but instead of "
+#| "calling it by a dull name like &ldquo;<em>somethingorother</em> "
+#| "TECO&rdquo;, he thought of a clever amusing name.  (That's what hacking "
+#| "means: <a href=\"http://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
 "The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
 "The author of TINT wrote another implementation of TECO (there were already "
 "many of them, for various systems), but instead of calling it by a dull name "
 "like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of a clever "
-"amusing name.  (That's what hacking means: <a href=\"http://stallman.org/";
+"amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
 "O primeiro acrônimo recursivo desse tipo foi TINT, <cite>“TINT Is Not 
<abbr "
@@ -2581,7 +2634,7 @@
 "(É o que o hacking significa: <a href=\"http://stallman.org/articles/on-";
 "hacking.html\">inteligência brincalhona</a>.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Other hackers enjoyed that name so much that we imitated the approach.  It "
 "became a tradition that, when you were writing from scratch a program that "
@@ -2597,7 +2650,7 @@
 "Nesse mesmo espírito, chamamos nossa substituição para o Unix de "
 "<cite>“GNU's Not Unix”</cite>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Historically, AT&amp;T which developed Unix did not want anyone to give it "
 "credit by using &ldquo;Unix&rdquo; in the name of a similar system, not even "
@@ -2613,7 +2666,7 @@
 "cada uma das várias versões modificadas do Unix (todas privativas, como o "
 "Unix) tinha um nome completamente diferente que não incluía o “Unix”."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we say &ldquo;GNU/BSD&rdquo; too? <span class=\"anchor-reference-id\">"
 "(<a href=\"#bsd\">#bsd</a>)</span>"
@@ -2621,7 +2674,7 @@
 "Eu devo dizer “GNU/BSD” também? <span class=\"anchor-reference-id\">(<a 
href="
 "\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems, "
 "because that term does not fit the history of the BSD systems."
@@ -2629,9 +2682,15 @@
 "Nós não chamamos os sistemas BSD (FreeBSD, etc.) de sistemas “GNU/BSD”, 
"
 "porque esse termo não corresponde ao histórico dos sistemas BSD."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The BSD system was developed by UC Berkeley as non-free software in the "
+#| "80s, and became free in the early 90s.  A free operating system that "
+#| "exists today is almost certainly either a variant of the GNU system, or a "
+#| "kind of BSD system."
 msgid ""
-"The BSD system was developed by UC Berkeley as non-free software in the 80s, "
+"The BSD system was developed by UC Berkeley as nonfree software in the 80s, "
 "and became free in the early 90s.  A free operating system that exists today "
 "is almost certainly either a variant of the GNU system, or a kind of BSD "
 "system."
@@ -2641,7 +2700,7 @@
 "Um sistema operacional livre que existe hoje é quase certamente uma variante 
"
 "do sistema GNU, ou um tipo de sistema BSD."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "People sometimes ask whether BSD too is a variant of GNU, as GNU/Linux is.  "
 "It is not.  The BSD developers were inspired to make their code free "
@@ -2655,7 +2714,7 @@
 "explícitos dos ativistas do GNU ajudaram a convencê-los a começar, mas o "
 "código tinha pouca sobreposição com o GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "BSD systems today use some GNU packages, just as the GNU system and its "
 "variants use some BSD programs; however, taken as wholes, they are two "
@@ -2669,7 +2728,7 @@
 "desenvolvedores do BSD não escreveram um kernel e o adicionaram ao sistema "
 "GNU, então um nome como o GNU/BSD não seria adequado à situação."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The connection between GNU/Linux and GNU is much closer, and that's why the "
 "name &ldquo;GNU/Linux&rdquo; is appropriate for it."
@@ -2677,7 +2736,7 @@
 "A conexão entre GNU/Linux e GNU é muito mais próxima e é por isso que o 
nome "
 "“GNU/Linux” é apropriado para isso."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is a version of GNU which uses the kernel from NetBSD.  Its developers "
 "call it &ldquo;Debian GNU/NetBSD&rdquo;, but &ldquo;GNU/"
@@ -2691,7 +2750,7 @@
 "um sistema BSD, já que a maioria do sistema é o mesmo que o sistema GNU/"
 "Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "If I install the GNU tools on Windows, does that mean I am running a GNU/"
 "Windows system? <span class=\"anchor-reference-id\">(<a href=\"#othersys"
@@ -2701,7 +2760,7 @@
 "executando um sistema GNU/Windows? <span class=\"anchor-reference-id\">(<a "
 "href=\"#othersys\">#othersys</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
 "GNU are just a part of the GNU software, which is just a part of the GNU "
@@ -2715,7 +2774,7 @@
 "não possui nenhum código em comum com o GNU. Em suma, essa é uma 
situação "
 "muito diferente do GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can't Linux be used without GNU? <span class=\"anchor-reference-id\">(<a "
 "href=\"#justlinux\">#justlinux</a>)</span>"
@@ -2723,7 +2782,7 @@
 "O Linux não pode ser usado sem o GNU? <span class=\"anchor-reference-id\">"
 "(<a href=\"#justlinux\">#justlinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is used by itself, or with small other programs, in some appliances.  "
 "These small software systems are a far cry from the GNU/Linux system.  Users "
@@ -2738,7 +2797,7 @@
 "com o Linux, para mostrar quão diferentes essas pequenas plataformas são de 
"
 "GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How much of the GNU system is needed for the system to be GNU/Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
@@ -2747,7 +2806,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "&ldquo;How much&rdquo; is not a meaningful question because the GNU system "
 "does not have precise boundaries."
@@ -2755,7 +2814,7 @@
 "O “quanto” não é uma questão significante porque o sistema GNU não 
possui "
 "limites precisos."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is an operating system maintained by a community.  It includes far more "
 "than just the GNU software packages (of which we have a specific list), and "
@@ -2771,7 +2830,7 @@
 "gera GNU/Linux. Se você usa uma parte do sistema GNU e omite outra parte, "
 "não há uma maneira significativa de dizer “quanto” você usou."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we look at the level of packages, Linux is one important package in the "
 "GNU/Linux system.  The inclusion of one important GNU package is enough to "
@@ -2781,7 +2840,7 @@
 "sistema GNU/Linux. A inclusão de um pacote importante do GNU é suficiente "
 "para justificar o nosso pedido de menção igual."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Are there complete Linux systems [sic] without GNU? <span class=\"anchor-"
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
@@ -2791,7 +2850,7 @@
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There are complete systems that contain Linux and not GNU; Android is an "
 "example.  But it is a mistake to call them &ldquo;Linux&rdquo; systems, just "
@@ -2801,7 +2860,7 @@
 "exemplo. Mas é um erro chamá-los sistemas “Linux”, assim como é um 
erro "
 "chamar o GNU de um sistema “Linux”."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android is very different from the GNU/Linux system&mdash;because the two "
 "have very little code in common.  In fact, the only thing they have in "
@@ -2811,7 +2870,7 @@
 "muito pouco código em comum. Na verdade, a única coisa que eles têm em 
comum "
 "é o Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
 "necessary to say things like, &ldquo;Android contains Linux, but it isn't "
@@ -2823,7 +2882,7 @@
 "possui as bibliotecas usuais do Linux [sic] e utilitários [que são do "
 "sistema GNU]”."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android contains just as much of Linux as GNU/Linux does.  What it doesn't "
 "have is the GNU system.  Android replaces that with Google software that "
@@ -2835,7 +2894,7 @@
 "que funciona de forma bastante diferente. O que torna o Android diferente do "
 "GNU/Linux é a ausência do GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Is it correct to say &ldquo;using Linux&rdquo; if it refers to using GNU/"
 "Linux and using Android? <span class=\"anchor-reference-id\">(<a href="
@@ -2847,7 +2906,7 @@
 "\"#usegnulinuxandandroidlinuxsyswithoutgnu"
 "\">#usegnulinuxandandroidlinuxsyswithoutgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Far from it.  That usage is so strained that people will not understand the "
 "intended meaning."
@@ -2855,7 +2914,7 @@
 "Longe disso. Esse uso é tão tenso que as pessoas não entenderão o "
 "significado pretendido."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public will find it very strange to speak of using Android as &ldquo;"
 "using Linux&rdquo;.  It's like having a conversation, then saying you were "
@@ -2865,7 +2924,7 @@
 "Linux”. É como ter uma conversa, depois dizer que você estava conversando 
"
 "com os intestinos da pessoa ou com o sistema circulatório da pessoa."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public <em>will</em> understand the idea of &ldquo;using Linux&rdquo; "
 "when it's really GNU/Linux, by way of the usual misunderstanding: thinking "
@@ -2875,7 +2934,7 @@
 "realmente GNU/Linux, por meio do mal-entendido usual: pensar em todo o "
 "sistema como “Linux”."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Use of Android and use of GNU/Linux are totally different, as different as "
 "driving a car and riding a bicycle.  The fact that the first two both "
@@ -2897,7 +2956,7 @@
 "forma, a maneira clara de falar sobre o uso de GNU/Linux e Android é dizer "
 "“usando o GNU/Linux e o Android”."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not call the system &ldquo;Linux&rdquo; anyway, and strengthen Linus "
 "Torvalds' role as posterboy for our community? <span class=\"anchor-"
@@ -2907,7 +2966,7 @@
 "papel do Linus Torvalds como garoto-propaganda da nossa comunidade? <span "
 "class=\"anchor-reference-id\">(<a href=\"#helplinus\">#helplinus</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Linus Torvalds is the &ldquo;posterboy&rdquo; (other people's choice of "
 "word, not ours) for his goals, not ours.  His goal is to make the system "
@@ -2925,12 +2984,22 @@
 "html\">liberdade para cooperar</a> como um princípio ético, e é por isso 
que "
 "o público não conecta o nome “Linux” com esse princípio."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Linus publicly states his disagreement with the free software movement's "
+#| "ideals.  He developed non-free software in his job for many years (and "
+#| "said so to a large audience at a &ldquo;Linux&rdquo;World show), and "
+#| "publicly invited fellow developers of Linux, the kernel, to use non-free "
+#| "software to work on it with him.  He goes even further, and rebukes "
+#| "people who suggest that engineers and scientists should consider social "
+#| "consequences of our technical work&mdash;rejecting the lessons society "
+#| "learned from the development of the atom bomb."
 msgid ""
 "Linus publicly states his disagreement with the free software movement's "
-"ideals.  He developed non-free software in his job for many years (and said "
+"ideals.  He developed nonfree software in his job for many years (and said "
 "so to a large audience at a &ldquo;Linux&rdquo;World show), and publicly "
-"invited fellow developers of Linux, the kernel, to use non-free software to "
+"invited fellow developers of Linux, the kernel, to use nonfree software to "
 "work on it with him.  He goes even further, and rebukes people who suggest "
 "that engineers and scientists should consider social consequences of our "
 "technical work&mdash;rejecting the lessons society learned from the "
@@ -2946,7 +3015,7 @@
 "rejeitando as lições que a sociedade aprendeu com o desenvolvimento da 
bomba "
 "atômica."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with writing a free program for the motivations of "
 "learning and having fun; the kernel Linus wrote for those reasons was an "
@@ -2966,7 +3035,7 @@
 "devem estar conscientes de que o sistema operacional em questão decorre de "
 "ideais de liberdade, não de seus pontos de vista."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong for us to label Linus Torvalds' work as GNU? <span class="
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
@@ -2974,7 +3043,7 @@
 "Não é errado rotularmos o trabalho do Linus Torvalds como GNU? <span class="
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong, so we don't do that.  Torvalds' work is Linux, the "
 "kernel; we are careful not to attribute that work to the GNU Project or "
@@ -2986,7 +3055,7 @@
 "rotulá-lo como “GNU”. Quando falamos sobre todo o sistema, o nome 
“GNU/"
 "Linux” dá-lhe uma parte do crédito."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Does Linus Torvalds agree that Linux is just the kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
@@ -2994,10 +3063,17 @@
 "O Linus Torvalds concorda que o Linux é apenas o kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
+#| "versions/RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are "
+#| "GNU software and are under the GNU copyleft. These tools aren't in the "
+#| "distribution - ask me (or GNU)  for more info&rdquo;</a>."
 msgid ""
 "He recognized this at the beginning.  The earliest Linux release notes said, "
-"<a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"<a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
 "RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are GNU software "
 "and are under the GNU copyleft. These tools aren't in the distribution - ask "
 "me (or GNU)  for more info&rdquo;</a>."
@@ -3008,7 +3084,7 @@
 "software GNU e está sob o copyleft do GNU. Essas ferramentas não estão na "
 "distribuição - pergunte-me (ou ao GNU) para mais informações”</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not finish the GNU Hurd kernel, release the GNU system as a whole, and "
 "forget the question of what to call GNU/Linux? <span class=\"anchor-"
@@ -3018,7 +3094,7 @@
 "completo e esquecer a questão de como chamar o GNU/Linux? <span class="
 "\"anchor-reference-id\">(<a href=\"#finishhurd\">#finishhurd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We would like credit for the GNU operating system no matter which kernel is "
 "used with it."
@@ -3026,13 +3102,20 @@
 "Gostaríamos de crédito para o sistema operacional GNU independentemente do "
 "kernel usado com ele."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Making the GNU Hurd work well enough to compete with Linux would be a big "
+#| "job, and it's not clearly necessary.  The only thing ethically wrong with "
+#| "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the "
+#| "best fix for that problem is <a href=\"http://fsf.org/campaigns/priority-";
+#| "projects\"> developing free replacement for the blobs</a>."
 msgid ""
 "Making the GNU Hurd work well enough to compete with Linux would be a big "
 "job, and it's not clearly necessary.  The only thing ethically wrong with "
 "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the best "
-"fix for that problem is <a href=\"http://fsf.org/campaigns/priority-projects";
-"\"> developing free replacement for the blobs</a>."
+"fix for that problem is <a href=\"https://www.fsf.org/campaigns/priority-";
+"projects\"> developing free replacement for the blobs</a>."
 msgstr ""
 "Fazer o GNU Hurd funcionar bem o suficiente para competir com o Linux seria "
 "um grande trabalho e não é claramente necessário. A única coisa 
eticamente "
@@ -3040,7 +3123,7 @@
 "solução para esse problema é <a href=\"http://fsf.org/campaigns/priority-";
 "projects\"> desenvolver substitutos livres para os blobs</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The battle is already lost&mdash;society has made its decision and we can't "
 "change it, so why even think about it? <span class=\"anchor-reference-id\">"
@@ -3050,7 +3133,7 @@
 "podemos alterá-la, então por que pensar nisso? <span class=\"anchor-"
 "reference-id\">(<a href=\"#lost\">#lost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This isn't a battle, it is a campaign of education.  What to call the system "
 "is not a single decision, to be made at one moment by &ldquo;society&rdquo;: "
@@ -3065,7 +3148,7 @@
 "fazer os outros dizerem “GNU/Linux”, mas você pode decidir chamar o 
sistema "
 "de “GNU/Linux” você mesmo e, ao fazê-lo, ajudará a educar os outros."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Society has made its decision and we can't change it, so what good does it "
 "do if I say &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id\">(<a "
@@ -3075,7 +3158,7 @@
 "benefício de eu dizer “GNU/Linux”? <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#whatgood\">#whatgood</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is not an all-or-nothing situation: correct and incorrect pictures are "
 "being spread more or less by various people.  If you call the system &ldquo;"
@@ -3095,7 +3178,7 @@
 "“GNU/Linux”, você terá educado um número substancial de pessoas com 
muito "
 "pouco trabalho. E alguns deles espalharão a correção para os outros."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to call the system &ldquo;Linux&rdquo; and teach "
 "people its real origin with a ten-minute explanation? <span class=\"anchor-"
@@ -3105,7 +3188,7 @@
 "origem com uma explicação de dez minutos? <span class=\"anchor-reference-id"
 "\">(<a href=\"#explain\">#explain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "If you help us by explaining to others in that way, we appreciate your "
 "effort, but that is not the best method.  It is not as effective as calling "
@@ -3115,7 +3198,7 @@
 "esforço, mas esse não é o melhor método. Não é tão eficaz quanto 
chamar o "
 "sistema de “GNU/Linux”, e usa seu tempo de forma ineficiente."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is ineffective because it may not sink in, and surely will not "
 "propagate.  Some of the people who hear your explanation will pay attention, "
@@ -3131,7 +3214,7 @@
 "eles só o chamarão de “Linux”. Sem sequer ter a intenção, eles 
ajudarão a "
 "espalhar a imagem incorreta."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is inefficient because it takes a lot more time.  Saying and writing "
 "&ldquo;GNU/Linux&rdquo; will take you only a few seconds a day, not minutes, "
@@ -3145,7 +3228,7 @@
 "Linux quando você escreve e fala é, de longe, a maneira mais fácil de 
ajudar "
 "o Projeto GNU efetivamente."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people laugh at you when you ask them to call the system GNU/Linux.  "
 "Why do you subject yourself to this treatment? <span class=\"anchor-"
@@ -3155,7 +3238,7 @@
 "Linux. Por que se sujeitar a esse tratamento? <span class=\"anchor-reference-"
 "id\">(<a href=\"#treatment\">#treatment</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; tends to give people a mistaken "
 "picture of the system's history and reason for existence.  People who laugh "
@@ -3169,7 +3252,7 @@
 "trabalho foi feito por Linus, então eles riem quando pedimos crédito por "
 "isso. Se eles soubessem a verdade, provavelmente eles não ririam."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Why do we take the risk of making a request that sometimes leads people to "
 "ridicule us? Because often it has useful results that help the GNU Project.  "
@@ -3180,7 +3263,7 @@
 "Projeto GNU. Nós vamos correr o risco de abuso imerecido para alcançar "
 "nossos objetivos."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you see such an ironically unfair situation occurring, please don't sit "
 "idly by.  Please teach the laughing people the real history.  When they see "
@@ -3190,7 +3273,7 @@
 "Ensine as pessoas rindo a história real. Quando eles virem por que o pedido "
 "é justificado, aqueles que têm algum bom senso deixarão de rir."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people condemn you when you ask them to call the system GNU/Linux.  "
 "Don't you lose by alienating them? <span class=\"anchor-reference-id\">(<a "
@@ -3200,7 +3283,7 @@
 "de GNU/Linux. Vocês não perdem por aliená-las? <span class=\"anchor-"
 "reference-id\">(<a href=\"#alienate\">#alienate</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not much.  People who don't appreciate our role in developing the system are "
 "unlikely to make substantial efforts to help us.  If they do work that "
@@ -3217,7 +3300,7 @@
 "trabalho a outra pessoa, eles estão minando nossa capacidade de recrutar a "
 "ajuda de outros."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It makes no sense to worry about alienating people who are already mostly "
 "uncooperative, and it is self-defeating to be deterred from correcting a "
@@ -3229,7 +3312,7 @@
 "problema, para que não irritemos as pessoas que a perpetuam. Portanto, "
 "continuaremos tentando corrigir o nome incorreto."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Whatever you contributed, is it legitimate to rename the operating system? "
 "<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
@@ -3238,7 +3321,7 @@
 "operacional? <span class=\"anchor-reference-id\">(<a href=\"#rename"
 "\">#rename</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are not renaming anything; we have been calling this system &ldquo;"
 "GNU&rdquo; ever since we announced it in 1983.  The people who tried to "
@@ -3248,7 +3331,7 @@
 "anunciamos em 1983. As pessoas que tentaram renomeá-lo para o “Linux” 
que "
 "não deveria ter feito isso."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong to force people to call the system &ldquo;GNU/Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
@@ -3256,7 +3339,7 @@
 "Não é errado forçar as pessoas a chamar o sistema de “GNU/Linux”? 
<span "
 "class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong to force them, and we don't try.  We call the system "
 "&ldquo;GNU/Linux&rdquo;, and we ask you to do it too."
@@ -3264,7 +3347,7 @@
 "Seria errado forçá-los, e não tentamos. Chamamos o sistema de 
“GNU/Linux” e "
 "pedimos que você faça isso também."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not sue people who call the whole system &ldquo;Linux&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
@@ -3272,7 +3355,7 @@
 "Por que não processar as pessoas que chamam todo o sistema de “Linux”? 
<span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are no legal grounds to sue them, but since we believe in freedom of "
 "speech, we wouldn't want to do that anyway.  We ask people to call the "
@@ -3282,7 +3365,7 @@
 "de expressão, não iríamos querer fazer isso de qualquer maneira. Pedimos à
s "
 "pessoas que chamem o sistema de “GNU/Linux” porque é a coisa certa a 
fazer."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Shouldn't you put something in the GNU GPL to require people to call the "
 "system &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id\">(<a href="
@@ -3292,13 +3375,23 @@
 "pessoas chamem o sistema de “GNU”? <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#require\">#require</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU GPL is to protect the users' freedom from those "
+#| "who would make proprietary versions of free software.  While it is true "
+#| "that those who call the system &ldquo;Linux&rdquo; often do things that "
+#| "limit the users' freedom, such as bundling non-free software with the GNU/"
+#| "Linux system or even developing non-free software for such use, the mere "
+#| "act of calling the system &ldquo;Linux&rdquo; does not, in itself, deny "
+#| "users their freedom.  It seems improper to make the GPL restrict what "
+#| "name people can use for the system."
 msgid ""
 "The purpose of the GNU GPL is to protect the users' freedom from those who "
 "would make proprietary versions of free software.  While it is true that "
 "those who call the system &ldquo;Linux&rdquo; often do things that limit the "
-"users' freedom, such as bundling non-free software with the GNU/Linux system "
-"or even developing non-free software for such use, the mere act of calling "
+"users' freedom, such as bundling nonfree software with the GNU/Linux system "
+"or even developing nonfree software for such use, the mere act of calling "
 "the system &ldquo;Linux&rdquo; does not, in itself, deny users their "
 "freedom.  It seems improper to make the GPL restrict what name people can "
 "use for the system."
@@ -3312,7 +3405,7 @@
 "dos usuários. Parece improcedente fazer com que a GPL restrinja o nome que "
 "as pessoas podem usar para o sistema."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you objected to the original BSD license's advertising requirement to "
 "give credit to the University of California, isn't it hypocritical to demand "
@@ -3324,7 +3417,7 @@
 "crédito para o projeto GNU? <span class=\"anchor-reference-id\">(<a href="
 "\"#BSDlicense\">#BSDlicense</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would be hypocritical to make the name GNU/Linux a license requirement, "
 "and we don't.  We only <em>ask</em> you to give us the credit we deserve."
@@ -3332,7 +3425,7 @@
 "Seria hipócrita fazer o nome GNU/Linux ser requisito de licença, e nós 
não "
 "fazemos. Nós <em>pedimos</em> a você para nos dar o crédito que merecemos."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please note that there are at least <a href=\"/licenses/bsd.html\"> two "
 "different BSD licenses</a>.  For clarity's sake, please don't use the term "
@@ -3342,7 +3435,7 @@
 "licenças BSD diferentes</a>. Por razões de clareza, não use o termo 
“licença "
 "BSD” sem especificar qual delas."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you failed to put something in the GNU GPL to require people to call "
 "the system &ldquo;GNU&rdquo;, you deserve what happened; why are you "
@@ -3354,7 +3447,7 @@
 "estão reclamando agora? <span class=\"anchor-reference-id\">(<a href="
 "\"#deserve\">#deserve</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The question presupposes a rather controversial general ethical premise: "
 "that if people do not force you to treat them fairly, you are entitled to "
@@ -3366,12 +3459,12 @@
 "aproveitar delas tanto quanto você quiser. Em outras palavras, pressupõe 
que "
 "o caminho esteja correto."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope you disagree with that premise just as we do."
 msgstr ""
 "Esperamos que você discorde dessa premissa tanto quanto nós discordamos."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't you be better off not contradicting what so many people believe? "
 "<span class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)"
@@ -3381,7 +3474,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't think we should go along with large numbers of people because they "
 "have been misled.  We hope you too will decide that truth is important."
@@ -3390,7 +3483,7 @@
 "porque elas foram enganadas. Esperamos que você também decida que a verdade 
"
 "é importante."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We could never have developed a free operating system without first denying "
 "the belief, held by most people, that proprietary software was legitimate "
@@ -3400,7 +3493,7 @@
 "crença, mantida pela maioria das pessoas, de que o software privativo era "
 "legítimo e aceitável."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
 "<span class=\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</"
@@ -3410,11 +3503,11 @@
 "class=\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "We don't think that the popularity of an error makes it the truth."
 msgstr "Nós não pensamos que a popularidade de um erro o torna verdade."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it better to call the system by the name most users already know? "
 "<span class=\"anchor-reference-id\">(<a href=\"#knownname\">#knownname</a>)</"
@@ -3424,7 +3517,7 @@
 "conhecem? <span class=\"anchor-reference-id\">(<a href=\"#knownname"
 "\">#knownname</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo; includes "
 "&ldquo;Linux&rdquo;, they will recognize what you're talking about.  If you "
@@ -3436,7 +3529,7 @@
 "“(muitas vezes, erroneamente referido como ‘Linux’)” de vez em 
quando, todos "
 "entenderão."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many people care about what's convenient or who's winning, not about "
 "arguments of right or wrong.  Couldn't you get more of their support by a "
@@ -3448,19 +3541,26 @@
 "delas seguindo um caminho diferente? <span class=\"anchor-reference-id\">(<a "
 "href=\"#winning\">#winning</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+#, fuzzy
+#| msgid ""
+#| "To care only about what's convenient or who's winning is an amoral "
+#| "approach to life.  Non-free software is an example of that amoral "
+#| "approach and thrives on it.  Thus, in the long run it would be self-"
+#| "defeating for us to adopt that approach.  We will continue talking in "
+#| "terms of right and wrong."
 msgid ""
 "To care only about what's convenient or who's winning is an amoral approach "
-"to life.  Non-free software is an example of that amoral approach and "
-"thrives on it.  Thus, in the long run it would be self-defeating for us to "
-"adopt that approach.  We will continue talking in terms of right and wrong."
+"to life.  Nonfree software is an example of that amoral approach and thrives "
+"on it.  Thus, in the long run it would be self-defeating for us to adopt "
+"that approach.  We will continue talking in terms of right and wrong."
 msgstr ""
 "Cuidar apenas do que é conveniente ou de quem está ganhando é uma 
abordagem "
 "amoral da vida. O software não livre é um exemplo dessa abordagem amoral e "
 "prospera nele. Assim, a longo prazo, seria autodestrutivo para nós adotar "
 "essa abordagem. Continuaremos falando em termos de certo e errado."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope that you are one of those for whom right and wrong do matter."
 msgstr ""
 "Esperamos que você seja um daqueles para quem o certo e o errado importam."
@@ -3510,12 +3610,16 @@
 "contribuição com traduções das páginas deste site."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation, "
+"Inc."
 msgstr ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+"Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -3539,6 +3643,13 @@
 msgid "Updated:"
 msgstr "Última atualização:"
 
+#~ msgid ""
+#~ "Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
+#~ "Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
+#~ "Free Software Foundation, Inc."
+
 #~ msgid "GNU/Linux FAQ by Richard Stallman"
 #~ msgstr "Perguntas frequentes (FAQ) sobre GNU/Linux por Richard Stallman"
 

Index: gnu/po/gnu-linux-faq.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.ru.po,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -b -r1.122 -r1.123
--- gnu/po/gnu-linux-faq.ru.po  8 Apr 2021 11:34:36 -0000       1.122
+++ gnu/po/gnu-linux-faq.ru.po  30 Aug 2021 13:34:53 -0000      1.123
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-04-08 17:17+0000\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <www-ru-list@gnu.org>\n"
@@ -18,6 +18,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -25,32 +26,17 @@
 msgstr ""
 "Вопросы о GNU/Linux - Проект GNU - Фонд 
свободного программного обеспечения"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU/Linux FAQ"
 msgstr "Вопросы о GNU/Linux"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by Richard Stallman"
 msgstr "Ричард Столмен"
 
-# type: Content of: <div><blockquote><p>
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
-"linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a href=\"/"
-"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Другие сведения об этом вопросе можно 
получить на наших страницах <a href=\"/"
-"gnu/linux-and-gnu.html\">&ldquo;Linux и проект GNU&rdquo;</a>, <a 
href=\"/"
-"gnu/why-gnu-linux.html\">&ldquo;Почему 
&lsquo;GNU/Linux&rsquo;?&rdquo;</a> и "
-"<a 
href=\"/gnu/gnu-users-never-heard-of-gnu.html\">&ldquo;Пользователи 
GNU, "
-"которые никогда не слышали о GNU&rdquo;</a>."
-
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When people see that we use and recommend the name GNU/Linux for a system "
 "that many others call just &ldquo;Linux&rdquo;, they ask many questions.  "
@@ -61,6 +47,13 @@
 "Linux&rdquo;, они задают много вопросов. Вот 
наиболее общие из них и наши "
 "ответы на них:"
 
+#. type: Content of: <div><div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "Содержание"
+
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<a href=\"#why\">Why do you call the system we use GNU/Linux and not Linux?</"
@@ -664,8 +657,36 @@
 "не споры о том, что честно, а что нет. Разве 
вы не могли бы получить больше "
 "поддержки с их стороны при другом подх
оде?</a>"
 
+# type: Content of: <div><blockquote><p>
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
+# | {+System</a>,+} our page on <a href=\"/gnu/why-gnu-linux.html\">Why
+# | GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our page on <a href=\"/"
+#| "gnu/linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a "
+#| "href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
+"linux-and-gnu.html\">Linux and the GNU System</a>, our page on <a href=\"/"
+"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Другие сведения об этом вопросе можно 
получить на наших страницах <a href=\"/"
+"gnu/linux-and-gnu.html\">&ldquo;Linux и проект GNU&rdquo;</a>, <a 
href=\"/"
+"gnu/why-gnu-linux.html\">&ldquo;Почему 
&lsquo;GNU/Linux&rsquo;?&rdquo;</a> и "
+"<a 
href=\"/gnu/gnu-users-never-heard-of-gnu.html\">&ldquo;Пользователи 
GNU, "
+"которые никогда не слышали о GNU&rdquo;</a>."
+
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you call the system we use GNU/Linux and not Linux? <span class="
 "\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>"
@@ -675,7 +696,7 @@
 "\">#why</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Most operating system distributions based on Linux as kernel are basically "
 "modified versions of the GNU operating system.  We began developing GNU in "
@@ -695,13 +716,13 @@
 "единый вклад в систему в целом. Общий план 
развития тоже был нашим."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "In fairness, we ought to get at least equal mention."
 msgstr ""
 "Справедливости ради мы должны получить 
упоминание по меньшей мере на равных."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and the GNU System</a> and <a "
 "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
@@ -715,7 +736,7 @@
 "gnu-project.html\">&ldquo;Проект GNU&rdquo;</a>."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why is the name important? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
@@ -724,7 +745,7 @@
 "\"#whycare\">#whycare</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Although the developers of Linux, the kernel, are contributing to the free "
 "software community, many of them do not care about freedom.  People who "
@@ -740,7 +761,7 @@
 "разработчиков чрезмерный вес."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Calling the system GNU/Linux recognizes the role that our idealism played in "
 "building our community, and <a href=\"/gnu/why-gnu-linux.html\">helps the "
@@ -752,7 +773,7 @@
 "важность этих идеалов</a>."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the real relationship between GNU and Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#what\">#what</a>)</span>"
@@ -760,7 +781,7 @@
 "Какова на самом деле связь между GNU и Linux? 
<span class=\"anchor-reference-"
 "id\">(<a href=\"#what\">#what</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU operating system and the Linux kernel are separate software projects "
 "that do complementary jobs.  Typically they are packaged in a <a href=\"/"
@@ -772,7 +793,7 @@
 "и применяются совместно."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How did it come about that most people call the system &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
@@ -783,7 +804,7 @@
 "\">#howerror</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; is a confusion that has spread faster "
 "than the corrective information."
@@ -792,7 +813,7 @@
 "распространилось быстрее, чем 
опровергающая его информация."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who combined Linux with the GNU system were not aware that that's "
 "what their activity amounted to.  They focused their attention on the piece "
@@ -811,7 +832,7 @@
 "исправить эту практику. К тому времени это 
заблуждение зашло уже далеко."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the people who call the system &ldquo;Linux&rdquo; have never heard "
 "why that's not the right thing.  They saw others using that name and assume "
@@ -831,7 +852,7 @@
 "мысли о том, что систему следует называть 
&ldquo;Linux&rdquo;."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Many of the questions in this file represent people's attempts to justify "
 "the name they are accustomed to using."
@@ -840,7 +861,7 @@
 "использование названия, которое они 
привыкли употреблять."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we always say &ldquo;GNU/Linux&rdquo; instead of &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
@@ -850,7 +871,7 @@
 "\">#always</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not always&mdash;only when you're talking about the whole system.  When "
 "you're referring specifically to the kernel, you should call it &ldquo;"
@@ -861,7 +882,7 @@
 "Linux&rdquo;&nbsp;&mdash; названием, которое для него 
избрал разработчик."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
 "call the whole system by the same name as the kernel.  This causes many "
@@ -878,7 +899,7 @@
 "избегаете двусмысленности."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Would Linux have achieved the same success if there had been no GNU? <span "
 "class=\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</"
@@ -889,7 +910,7 @@
 "span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In that alternative world, there would be nothing today like the GNU/Linux "
 "system, and probably no free operating system at all.  No one attempted to "
@@ -906,7 +927,7 @@
 "текстов."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds was partly influenced by a speech about GNU in Finland in "
 "1990.  It's possible that even without this influence he might have written "
@@ -922,7 +943,7 @@
 "0.12)."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Even if Torvalds had released Linux under some other free software license, "
 "a free kernel alone would not have made much difference to the world.  The "
@@ -935,7 +956,7 @@
 "полной свободной операционной 
системы&nbsp;&mdash; GNU/Linux."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better for the community if you did not divide people with "
 "this request? <span class=\"anchor-reference-id\">(<a href=\"#divide"
@@ -946,7 +967,7 @@
 "a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
 "people.  We are asking them to give the GNU Project credit for the GNU "
@@ -957,7 +978,7 @@
 "GNU. Этим мы не критикуем никого и никого не 
отталкиваем."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, there are people who do not like our saying this.  Sometimes those "
 "people push us away in response.  On occasion they are so rude that one "
@@ -972,7 +993,7 @@
 "убедите их перестать это делать."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, this is only a secondary cause of division in our community.  The "
 "largest division in the community is between people who appreciate free "
@@ -991,7 +1012,7 @@
 "текст)."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This disagreement is not just a matter of names&mdash;it is a matter of "
 "differing basic values.  It is essential for the community to see and think "
@@ -1009,7 +1030,7 @@
 "&lsquo;свободная программа&rsquo;&rdquo;</a>."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The disagreement over values partially aligns with the amount of attention "
 "people pay to the GNU Project's role in our community.  People who value "
@@ -1035,7 +1056,7 @@
 "или будем полностью побеждены (будем 
надеяться, что этого не случится)."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Doesn't the GNU project support an individual's free speech rights to call "
 "the system by any name that individual chooses? <span class=\"anchor-"
@@ -1046,7 +1067,7 @@
 "href=\"#freespeech\">#freespeech</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Yes, indeed, we believe you have a free speech right to call the operating "
 "system by any name you wish.  We ask that people call it GNU/Linux as a "
@@ -1062,7 +1083,7 @@
 "этой системе."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since everyone knows the role of GNU in developing the system, doesn't the "
 "&ldquo;GNU/&rdquo; in the name go without saying? <span class=\"anchor-"
@@ -1073,7 +1094,7 @@
 "id\">(<a href=\"#everyoneknows\">#everyoneknows</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Experience shows that the system's users, and the computer-using public in "
 "general, often know nothing about the GNU system.  Most articles about the "
@@ -1089,7 +1110,7 @@
 "разъясняет этот вопрос подробнее."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who say this are probably geeks thinking of the geeks they know.  "
 "Geeks often do know about GNU, but many have a completely wrong idea of what "
@@ -1103,7 +1124,7 @@
 "или проект по разработке таких 
инструментов."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The wording of this question, which is typical, illustrates another common "
 "misconception.  To speak of &ldquo;GNU's role&rdquo; in developing something "
@@ -1118,7 +1139,7 @@
 "говорить о роли проекта GNU в той или иной 
деятельности, а не о роли GNU."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since I know the role of GNU in this system, why does it matter what name I "
 "use? <span class=\"anchor-reference-id\">(<a href="
@@ -1129,7 +1150,7 @@
 "\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your words don't reflect your knowledge, you don't teach others.  Most "
 "people who have heard of the GNU/Linux system think it is &ldquo;"
@@ -1143,7 +1164,7 @@
 "расскажете правду, то кто расскажет?"
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't shortening &ldquo;GNU/Linux&rdquo; to &ldquo;Linux&rdquo; just like "
 "shortening &ldquo;Microsoft Windows&rdquo; to &ldquo;Windows&rdquo;? <span "
@@ -1155,7 +1176,7 @@
 "\">#windows</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It's useful to shorten a frequently-used name, but not if the abbreviation "
 "is misleading."
@@ -1164,7 +1185,7 @@
 "сокращение вводит в заблуждение."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Almost everyone in developed countries really does know that the &ldquo;"
 "Windows&rdquo; system is made by Microsoft, so shortening &ldquo;Microsoft "
@@ -1180,7 +1201,7 @@
 "том, откуда происходит эта система."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The question is itself misleading because GNU and Microsoft are not the same "
 "kind of thing.  Microsoft is a company; GNU is an operating system."
@@ -1190,7 +1211,7 @@
 "компания; GNU&nbsp;&mdash; это операционная 
система."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't GNU a collection of programming tools that were included in Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
@@ -1200,7 +1221,7 @@
 "\">#tools</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "People who think that Linux is an entire operating system, if they hear "
 "about GNU at all, often get a wrong idea of what GNU is.  They may think "
@@ -1221,7 +1242,7 @@
 "&ldquo;Linux&rdquo;."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Project was named after the GNU operating system&mdash;it's the "
 "project to develop the GNU system.  (See <a href=\"/gnu/initial-announcement."
@@ -1232,7 +1253,7 @@
 "\">предварительное объявление 
1983&nbsp;года</a>.)"
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We developed programs such as GCC, GNU Emacs, GAS, GLIBC, BASH, etc., "
 "because we needed them for the GNU operating system.  GCC, the GNU Compiler "
@@ -1247,7 +1268,7 @@
 "разработали для системы GNU также Ghostscript, 
GNUCash, GNU Chess и GNOME."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the difference between an operating system and a kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
@@ -1256,7 +1277,7 @@
 "reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "An operating system, as we use the term, means a collection of programs that "
 "are sufficient to use the computer to do a wide variety of jobs.  A general "
@@ -1270,7 +1291,7 @@
 "захотят решать."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The kernel is one of the programs in an operating system&mdash;the program "
 "that allocates the machine's resources to the other programs that are "
@@ -1281,7 +1302,7 @@
 "Ядро также занимается запуском и 
остановкой других программ."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "To confuse matters, some people use the term &ldquo;operating system&rdquo; "
 "to mean &ldquo;kernel&rdquo;.  Both uses of the term go back many years.  "
@@ -1304,7 +1325,7 @@
 "система&rdquo; в том же смысле."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the time when people speak of the &ldquo;Linux operating "
 "system&rdquo; they are using &ldquo;operating system&rdquo; in the same "
@@ -1323,7 +1344,7 @@
 "по поводу того, какую именно совокупность 
программ вы имеете в виду."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
@@ -1336,7 +1357,7 @@
 "о дистрибутивах системы GNU/Linux."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The kernel of a system is like the foundation of a house.  How can a house "
 "be almost complete when it doesn't have a foundation? <span class=\"anchor-"
@@ -1347,7 +1368,7 @@
 "href=\"#house\">#house</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "A kernel is not much like the foundation of a house because building an "
 "operating system is not much like building a house."
@@ -1356,7 +1377,7 @@
 "системы не очень похоже на постройку дома."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A house is built from lots of little general parts that are cut and put "
 "together in situ.  They have to be put together from the bottom up.  Thus, "
@@ -1369,7 +1390,7 @@
 "все, что у вас есть&nbsp;&mdash; это яма в земле."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "By contrast, an operating system consists of complex components that can be "
 "developed in any order.  When you have developed most of the components, "
@@ -1386,7 +1407,7 @@
 "модуля, это было бы похоже на систему GNU в 
1992&nbsp;году."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't the kernel the brain of the system? <span class=\"anchor-reference-id"
 "\">(<a href=\"#brain\">#brain</a>)</span>"
@@ -1395,7 +1416,7 @@
 "id\">(<a href=\"#brain\">#brain</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A computer system is not much like a human body, and no part of it plays a "
 "role comparable to that of the brain in a human."
@@ -1404,7 +1425,7 @@
 "ее часть не играет роли, сравнимой с ролью 
человеческого мозга в организме."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't writing the kernel most of the work in an operating system? <span "
 "class=\"anchor-reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</"
@@ -1415,12 +1436,12 @@
 "\"#kernelmost\">#kernelmost</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "No, many components take a lot of work."
 msgstr "Нет, многие компоненты требуют 
большого объема работ."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "An operating system requires a kernel.  Since the GNU Project didn't develop "
 "a kernel, how can the system be GNU?<span class=\"anchor-reference-id\">(<a "
@@ -1430,7 +1451,7 @@
 "ядро, как система может быть GNU?<span 
class=\"anchor-reference-id\">(<a "
 "href=\"#nokernel\">#nokernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The people who argue that way for calling the system &ldquo;Linux&rdquo; are "
 "using a double standard.  An operating system requires compilers, editors, "
@@ -1445,7 +1466,7 @@
 "году. Поскольку Торвальдс не разработал 
ничего из этого, как система может "
 "быть &ldquo;Linux&rdquo;?"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "That standard is too strict, not the right way to judge the contributions of "
 "any contributor."
@@ -1453,7 +1474,7 @@
 "Это не слишком строгий стандарт, так не 
следует судить вклад какого бы то ни "
 "было соразработчика."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds made an important contribution to the operating system we "
 "use; the GNU Project started earlier and contributed much more.  The name "
@@ -1464,7 +1485,7 @@
 "&ldquo;GNU/Linux&rdquo; отдает вклад и тому, и 
другому."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How can GNU be an operating system, if I can't get something called &ldquo;"
 "GNU&rdquo; and install it? <span class=\"anchor-reference-id\">(<a href="
@@ -1474,7 +1495,7 @@
 "установить что-то под названием &ldquo;GNU&rdquo;? 
<span class=\"anchor-"
 "reference-id\">(<a href=\"#notinstallable\">#notinstallable</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Many <a href=\"/distros/distros.html\"> packaged and installable versions of "
 "GNU</a> are available.  None of them is called simply &ldquo;GNU&rdquo;, but "
@@ -1484,7 +1505,7 @@
 "подготовленных к установке</a>. Ни одна из 
них не называется просто &ldquo;"
 "GNU&rdquo;, но они в основе своей представляют 
именно GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We expected to release the GNU system packaged for installation, but this "
 "plan was overtaken by events: in 1992 others were already packaging GNU "
@@ -1505,7 +1526,7 @@
 "потому что так собирались называть версию 
системы с ядром GNU Hurd&nbsp;"
 "&mdash; которая к тому времени еще не была 
готова."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Hurd kernel never became sufficiently ready; we only recommend it to "
 "those interested in working on it.  So we never packaged GNU with the GNU "
@@ -1516,7 +1537,7 @@
 "дистрибутив GNU с ядром GNU Hurd. Однако Debian 
выпустил дистрибутив этой "
 "комбинации как Debian GNU/Hurd."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are now developing an advanced Scheme-based package manager called Guix "
 "and a complete system distribution based on it called the <a href=\"/"
@@ -1528,7 +1549,7 @@
 "названием <a href=\"/software/guix\">системный 
дистрибутив Guix</a> или "
 "GuixSD. Это подразумевает переупаковку 
существенной части системы GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We never took the last step of packaging GNU under the name &ldquo;"
 "GNU&rdquo;, but that doesn't alter what kind of thing GNU is.  GNU is an "
@@ -1539,7 +1560,7 @@
 "&mdash; операционная система."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "We're calling the whole system after the kernel, Linux.  Isn't it normal to "
 "name an operating system after a kernel? <span class=\"anchor-reference-id\">"
@@ -1550,7 +1571,7 @@
 "id\">(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "That practice seems to be very rare&mdash;we can't find any examples other "
 "than the misuse of the name &ldquo;Linux&rdquo;.  Normally an operating "
@@ -1567,7 +1588,7 @@
 "ядро такой-то системы&rdquo; или &ldquo;такое-то 
ядро&rdquo;."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Because those two constructions are used synonymously, the expression &ldquo;"
 "the Linux kernel&rdquo; can easily be misunderstood as meaning &ldquo;the "
@@ -1582,7 +1603,7 @@
 "или писать &ldquo;ядро (Linux)&rdquo; или &ldquo;Linux 
(ядро)&rdquo;."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can another system have &ldquo;the feel of Linux&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
@@ -1590,7 +1611,7 @@
 "Может ли другая система дать &ldquo;ощущение 
Linux&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is no such thing as the &ldquo;feel of Linux&rdquo; because Linux has "
 "no user interfaces.  Like any modern kernel, Linux is a base for running "
@@ -1606,7 +1627,7 @@
 "программы, а &ldquo;ощущение&rdquo; приходит от 
них."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  How about "
 "recommending a shorter name? <span class=\"anchor-reference-id\">(<a href="
@@ -1617,7 +1638,7 @@
 "reference-id\">(<a href=\"#long\">#long</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "For a while we tried the name &ldquo;LiGNUx&rdquo;, which combines the words "
 "&ldquo;GNU&rdquo; and &ldquo;Linux&rdquo;.  The reaction was very bad.  "
@@ -1629,7 +1650,7 @@
 "Linux&rdquo;."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
 "call it &ldquo;GNU/Linux&rdquo; <a href=\"#justgnu\"> for the reasons given "
@@ -1640,7 +1661,7 @@
 "\"> по причинам, изложенным ниже</a>."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How about calling the system &ldquo;GliNUx&rdquo; (instead of &ldquo;GNU/"
 "Linux&rdquo;)? <span class=\"anchor-reference-id\">(<a href="
@@ -1650,7 +1671,7 @@
 "Linux&rdquo;)? <span class=\"anchor-reference-id\">(<a href="
 "\"#long1\">#long1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The name &ldquo;GNU&rdquo; does not visibly appear in &ldquo;Glinux,&rdquo; "
 "so most people would not notice it is there.  Even if it is capitalized as "
@@ -1662,7 +1683,7 @@
 "буквами (&ldquo;GliNUx&rdquo;) большинство людей не 
будет осознавать, что "
 "здесь содержится ссылка на GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be comparable to writing &ldquo;GNU/Linux,&rdquo; but putting "
 "&ldquo;GNU/&rdquo; in print so small that most people could not read it."
@@ -1672,7 +1693,7 @@
 "это прочесть."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  Why should "
 "I go to the trouble of saying &ldquo;GNU/&rdquo;? <span class=\"anchor-"
@@ -1682,7 +1703,7 @@
 "длинно. Зачем мне мучиться и говорить 
&ldquo;GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#long2\">#long2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
 "the system that we developed, can't you take one second to recognize our "
@@ -1693,7 +1714,7 @@
 "тому, чтобы выразить признание нашей 
работы?"
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Unfortunately, &ldquo;GNU/Linux&rdquo; is five syllables. People won't use "
 "such a long term. Shouldn't you find a shorter one? <span class=\"anchor-"
@@ -1703,7 +1724,7 @@
 "будут употреблять такое длинное слово. Не 
найти ли вам что-нибудь короче? "
 "<span class=\"anchor-reference-id\">(<a href=\"#long3\">#long3</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, &ldquo;GNU/Linux&rdquo; is only four syllables.  &ldquo;"
 "Unfortunately&rdquo; is five syllables, yet people show no sign of "
@@ -1714,7 +1735,7 @@
 "видим, чтобы люди употребляли это слово с 
неохотой."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Stallman doesn't ask us to call him &ldquo;Richard Matthew Stallman&rdquo; "
 "every the time.  So why ask us to say &ldquo;GNU/Linux&rdquo; every time? "
@@ -1725,7 +1746,7 @@
 "Linux&rdquo;? <span class=\"anchor-reference-id\">(<a href="
 "\"#long4\">#long4</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Omitting &ldquo;Matthew&rdquo; does not misrepresent anything important "
 "about Stallman's nature, origin, ideas or purpose.  Omitting &ldquo;"
@@ -1736,7 +1757,7 @@
 "предназначении. Когда опускается 
&ldquo;GNU&rdquo;, то представление об этих "
 "аспектах системы GNU/Linux искажается."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is an example of a frequent way of hiding a fallacy: to bury it inside "
 "a misleading analogy.  A better analogy would be, &ldquo;Why shouldn't we "
@@ -1747,7 +1768,7 @@
 "мы не должны называть Столмена 
Торвальдсом?&rdquo;"
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since Linux is a secondary contribution, would it be false to the facts to "
 "call the system simply &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id"
@@ -1758,7 +1779,7 @@
 "\"anchor-reference-id\">(<a href=\"#justgnu\">#justgnu</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would not be false to the facts, but it is not the best thing to do.  "
 "Here are the reasons we call that system version &ldquo;GNU/Linux&rdquo; "
@@ -1768,7 +1789,7 @@
 "которым мы называем систему &ldquo;GNU/Linux&rdquo;, 
а не &ldquo;GNU&rdquo;:"
 
 # type: Content of: <dl><dd><ul><li>
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It's not exactly GNU&mdash;it has a different kernel (that is, Linux).  "
 "Distinguishing GNU/Linux from GNU is useful."
@@ -1777,7 +1798,7 @@
 "Различать GNU/Linux и GNU все же полезно."
 
 # type: Content of: <dl><dd><ul><li>
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It would be ungentlemanly to ask people to <em>stop</em> giving any credit "
 "to Linus Torvalds.  He did write an important component of the system.  We "
@@ -1798,7 +1819,7 @@
 "и его вклад в систему."
 
 # type: Content of: <dl><dd><ul><li>
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
 "&ldquo;GNU&rdquo; they may simply not recognize we're talking about the same "
@@ -1811,7 +1832,7 @@
 "с тем, о чем они уже слышали."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "I would have to pay a fee if I use &ldquo;Linux&rdquo; in the name of a "
 "product, and that would also apply if I say &ldquo;GNU/Linux&rdquo;.  Is it "
@@ -1826,7 +1847,7 @@
 "(<a href=\"#trademarkfee\">#trademarkfee</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There's nothing wrong in calling the system &ldquo;GNU&rdquo;; basically, "
 "that's what it is.  It is nice to give Linus Torvalds a share of the credit "
@@ -1837,7 +1858,7 @@
 "вы совсем не обязаны платить за право 
делать это."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "So if you want to refer to the system simply as &ldquo;GNU&rdquo;, to avoid "
 "paying the fee for calling it &ldquo;Linux&rdquo;, we won't criticize you."
@@ -1846,7 +1867,7 @@
 "платить за то, что называете ее &ldquo;Linux&rdquo;, 
мы вас не осудим."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today; it includes "
 "TeX, X11, Apache, Perl, and many more programs.  Don't your arguments imply "
@@ -1861,7 +1882,7 @@
 "reference-id\">(<a href=\"#many\">#many</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "What we say is that you ought to give the system's principal developer a "
 "share of the credit.  The principal developer is the GNU Project, and the "
@@ -1872,7 +1893,7 @@
 "система, в основном, GNU."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you feel even more strongly about giving credit where it is due, you "
 "might feel that some secondary contributors also deserve credit in the "
@@ -1891,7 +1912,7 @@
 "Perl&rdquo;&nbsp;&mdash; так и поступайте."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Since a long name such as GNU/X11/Apache/Linux/TeX/Perl/Python/FreeCiv "
 "becomes absurd, at some point you will have to set a threshold and omit the "
@@ -1906,7 +1927,7 @@
 "где бы вы ее ни провели, мы не станем с этим 
спорить."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Different threshold levels would lead to different choices of name for the "
 "system.  But one name that cannot result from concerns of fairness and "
@@ -1922,7 +1943,7 @@
 "то время, как главный вклад (GNU) 
игнорируется. "
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "systemd plays an important role in the GNU/Linux system as it is today; are "
 "we obligated to call it GNU/systemd/Linux? <span class=\"anchor-reference-id"
@@ -1932,7 +1953,7 @@
 "называть ее GNU/systemd/Linux? <span 
class=\"anchor-reference-id\">(<a href="
 "\"#others\">#others</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "systemd is a fairly important component, but not as important as the kernel "
 "(Linux), nor as important as the basis of the system as a whole (GNU).  "
@@ -1945,7 +1966,7 @@
 "&ldquo;GNU/systemd/Linux&rdquo;, в этом нет ничего 
дурного."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today, but they don't "
 "insist on calling it XYZ/Linux.  Why should we treat GNU specially? <span "
@@ -1957,7 +1978,7 @@
 "href=\"#others\">#others</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Thousands of projects have developed programs commonly included in today's "
 "GNU/Linux systems.  They all deserve credit for their contributions, but "
@@ -1970,7 +1991,7 @@
 "чтобы на них ссылались, как на одного из 
основных разработчиков."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is different because it is more than just a contributed program, more "
 "than just a collection of contributed programs.  GNU is the framework on "
@@ -1981,7 +2002,7 @@
 "это тот каркас, на котором была построена 
вся система."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "GNU is a small fraction of the system nowadays, so why should we mention it? "
 "<span class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</"
@@ -1992,7 +2013,7 @@
 "\">#allsmall</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In 2008, we found that GNU packages made up 15% of the &ldquo;main&rdquo; "
 "repository of the gNewSense GNU/Linux distribution.  Linux made up 1.5%.  So "
@@ -2005,7 +2026,7 @@
 "&ldquo;Linux&rdquo;."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is a small fraction of the system nowadays, and Linux is an even smaller "
 "fraction.  But they are the system's core; the system was made by combining "
@@ -2016,7 +2037,7 @@
 "объединением. Поэтому название 
&ldquo;GNU/Linux&rdquo; остается уместным."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many companies contributed to the system as it is today; doesn't that mean "
 "we ought to call it GNU/Red&nbsp;Hat/Novell/Linux? <span class=\"anchor-"
@@ -2028,7 +2049,7 @@
 "\">#manycompanies</a>)</span>"
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is not comparable to Red Hat or Novell; it is not a company, or an "
 "organization, or even an activity.  GNU is an operating system.  (When we "
@@ -2043,7 +2064,7 @@
 "должно присутствовать в ее названии."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Much of those companies' contribution to the GNU/Linux system lies in the "
 "code they have contributed to various GNU packages including GCC and GNOME.  "
@@ -2056,7 +2077,7 @@
 "с остальными разработчиками GNU."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
@@ -2067,7 +2088,7 @@
 "span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean "
@@ -2080,7 +2101,7 @@
 "пакет проекта GNU&rdquo;. Ни одно из этих 
значений не соответствует ситуации."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is not a GNU package; that is, it wasn't developed under the GNU "
 "Project's aegis or contributed specifically to the GNU Project.  Linus "
@@ -2093,14 +2114,32 @@
 "что значение &ldquo;Linux, пакет проекта GNU&rdquo; 
неверно."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | We're not talking about a distinct GNU version of Linux, the kernel.  The
+# | free GNU/Linux distros do have a <a
+# | [-href=\"http://directory.fsf.org/project/linux\";>separate-]
+# | {+href=\"https://directory.fsf.org/wiki/Linux-libre\";>separate+} version
+# | of Linux</a>, since the &ldquo;standard&rdquo; version contains
+# | non[---]free firmware &ldquo;blobs&rdquo;.  If this were part of the GNU
+# | Project, it could be considered &ldquo;GNU Linux&rdquo;; but we would not
+# | want to call it that, because it would be too confusing.
+#, fuzzy
+#| msgid ""
+#| "We're not talking about a distinct GNU version of Linux, the kernel.  The "
+#| "free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/";
+#| "project/linux\">separate version of Linux</a>, since the &ldquo;"
+#| "standard&rdquo; version contains non-free firmware &ldquo;blobs&rdquo;.  "
+#| "If this were part of the GNU Project, it could be considered &ldquo;GNU "
+#| "Linux&rdquo;; but we would not want to call it that, because it would be "
+#| "too confusing."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
-"free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/project/";
-"linux\">separate version of Linux</a>, since the &ldquo;standard&rdquo; "
-"version contains non-free firmware &ldquo;blobs&rdquo;.  If this were part "
-"of the GNU Project, it could be considered &ldquo;GNU Linux&rdquo;; but we "
-"would not want to call it that, because it would be too confusing."
+"free GNU/Linux distros do have a <a href=\"https://directory.fsf.org/wiki/";
+"Linux-libre\">separate version of Linux</a>, since the &ldquo;"
+"standard&rdquo; version contains nonfree firmware &ldquo;blobs&rdquo;.  If "
+"this were part of the GNU Project, it could be considered &ldquo;GNU "
+"Linux&rdquo;; but we would not want to call it that, because it would be too "
+"confusing."
 msgstr ""
 "Мы не имеем в виду особую версию Linux (ядра) 
в проекте GNU. В свободных "
 "дистрибутивах GNU/Linux <a 
href=\"http://directory.fsf.org/project/linux";
@@ -2111,7 +2150,7 @@
 "к большой путанице."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We're talking about a version of GNU, the operating system, distinguished by "
 "having Linux as the kernel.  A slash fits the situation because it means "
@@ -2125,7 +2164,7 @@
 "&ldquo;GNU/Linux&rdquo;."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are other ways to express &ldquo;combination&rdquo;.  If you think "
 "that a plus-sign is clearer, please use that.  In French, a hyphen is clear: "
@@ -2137,7 +2176,7 @@
 "французском языке понятен дефис: 
&ldquo;GNU-Linux&rdquo;. По-испански мы "
 "иногда говорим &ldquo;GNU con Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How is the name &ldquo;GNU/Linux&rdquo; pronounced? <span class=\"anchor-"
 "reference-id\">(<a href=\"#pronounce\">#pronounce</a>)</span>"
@@ -2145,7 +2184,7 @@
 "Как произносить название &ldquo;GNU/Linux&rdquo;? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#pronounce\">#pronounce</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please pronounce it as &ldquo;GNU slash Linux.&rdquo; If you don't pronounce "
 "the slash, people will think you are saying &ldquo;GNU Linux,&rdquo; which "
@@ -2159,7 +2198,7 @@
 "комбинации на английском языке</a>."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU Emacs&rdquo; rather than &ldquo;GNU/"
 "Emacs&rdquo;? <span class=\"anchor-reference-id\">(<a href=\"#whynoslash"
@@ -2170,7 +2209,7 @@
 "</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Emacs&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Emacs&rdquo;.  That is the right "
@@ -2180,7 +2219,7 @@
 "слово &ldquo;GNU&rdquo; является определением 
слова &ldquo;Emacs&rdquo;. Это "
 "правильно описывает программу под 
названием Emacs, являющуюся пакетом GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;GNU/Emacs&rdquo; would mean the combination of GNU, the operating "
 "system, and the program Emacs.  That doesn't fit this program, so &ldquo;GNU/"
@@ -2191,7 +2230,7 @@
 "как &ldquo;GNU/Emacs&rdquo; неверно."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why &ldquo;GNU/Linux&rdquo; rather than &ldquo;Linux/GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
@@ -2200,7 +2239,7 @@
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is right and proper to mention the principal contribution first.  The GNU "
 "contribution to the system is not only bigger than Linux and prior to Linux, "
@@ -2210,7 +2249,7 @@
 "корректно. Вклад GNU в систему не только 
больше, чем Linux, и был произведен "
 "раньше, чем Linux. На самом деле все это 
движение начали мы."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the lowest "
 "level of the system and GNU fills technically higher levels."
@@ -2219,7 +2258,7 @@
 "представляет низкий уровень, а GNU 
заполняет технически более высокие уровни."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
 "lot better than what people usually do, which is to omit GNU entirely and "
@@ -2230,7 +2269,7 @@
 "игнорируют GNU и создают видимость, что вся 
система и есть Linux."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
 "say anything about what the system consists of.  Why shouldn't they call it "
@@ -2242,7 +2281,7 @@
 "называть его так, как им вздумается?<span 
class=\"anchor-reference-id\">(<a "
 "href=\"#distronames0\">#distronames0</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling a system &ldquo;Foobar Linux&rdquo; implies that it's a flavor of "
 "&ldquo;Linux,&rdquo; and people <a href=\"#distronames\">understand it that "
@@ -2252,7 +2291,7 @@
 "&ldquo;Linux&rdquo;, и люди <a 
href=\"#distronames\">воспринимают это таким "
 "образом</a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If they called a GNU/Linux distro &ldquo;Foobar BSD,&rdquo; you would call "
 "that a mistake.  &ldquo;This system is not BSD,&rdquo; you would tell them.  "
@@ -2263,7 +2302,7 @@
 "Так вот, это и не Linux."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro is called &ldquo;Foobar Linux&rdquo;; doesn't that show it's "
 "really Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
@@ -2274,7 +2313,7 @@
 "(<a href=\"#distronames\">#distronames</a>)</span>"
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It means that the people who make the &ldquo;Foobar Linux&rdquo; distro are "
 "repeating the common mistake. We appreciate that distributions like Debian, "
@@ -2290,7 +2329,7 @@
 "к этому."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's official name is &ldquo;Foobar Linux&rdquo;; isn't it wrong to "
 "call the distro anything but &ldquo;Foobar Linux&rdquo;? <span class="
@@ -2301,7 +2340,7 @@
 "Linux&rdquo;? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames1\">#distronames1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When they spread misinformation by changing &ldquo;GNU&rdquo; to &ldquo;"
 "Linux&rdquo;, and call their version of it &ldquo;Foobar Linux&rdquo;, it's "
@@ -2314,7 +2353,7 @@
 "GNU/Linux&rdquo;."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be more effective to ask companies such as Mandrake, Red Hat and "
 "IBM to call their distributions &ldquo;GNU/Linux&rdquo; rather than asking "
@@ -2327,7 +2366,7 @@
 "href=\"#companies\">#companies</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It isn't a choice of one or the other&mdash;we ask companies and "
 "organizations and individuals to help spread the word about this.  In fact, "
@@ -2347,7 +2386,7 @@
 "правильно."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We can't make them do this right, but we're not the sort to give up just "
 "because the road isn't easy.  You may not have as much influence at your "
@@ -2362,7 +2401,7 @@
 "GNU/Linux&rdquo;."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to reserve the name &ldquo;GNU/Linux&rdquo; for "
 "distributions that are purely free software? After all, that is the ideal of "
@@ -2375,15 +2414,35 @@
 "span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+# | The widespread practice of adding non[---]free software to the GNU/Linux
+# | system is a major problem for our community.  It teaches the users that
+# | non[---]free software is ok, and that using it is part of the spirit of
+# | &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of
+# | their mission to help users use non[---]free add-ons, and may even invite
+# | salesmen to come and make sales pitches for them.  They adopt goals such
+# | as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them
+# | use non[---]free applications and drivers), or making the system more
+# | popular even at the cost of freedom.
+#, fuzzy
+#| msgid ""
+#| "The widespread practice of adding non-free software to the GNU/Linux "
+#| "system is a major problem for our community.  It teaches the users that "
+#| "non-free software is ok, and that using it is part of the spirit of "
+#| "&ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part "
+#| "of their mission to help users use non-free add-ons, and may even invite "
+#| "salesmen to come and make sales pitches for them.  They adopt goals such "
+#| "as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them "
+#| "use non-free applications and drivers), or making the system more popular "
+#| "even at the cost of freedom."
 msgid ""
-"The widespread practice of adding non-free software to the GNU/Linux system "
-"is a major problem for our community.  It teaches the users that non-free "
+"The widespread practice of adding nonfree software to the GNU/Linux system "
+"is a major problem for our community.  It teaches the users that nonfree "
 "software is ok, and that using it is part of the spirit of &ldquo;"
 "Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of their "
-"mission to help users use non-free add-ons, and may even invite salesmen to "
+"mission to help users use nonfree add-ons, and may even invite salesmen to "
 "come and make sales pitches for them.  They adopt goals such as &ldquo;"
-"helping the users&rdquo; of GNU/Linux (including helping them use non-free "
+"helping the users&rdquo; of GNU/Linux (including helping them use nonfree "
 "applications and drivers), or making the system more popular even at the "
 "cost of freedom."
 msgstr ""
@@ -2399,12 +2458,12 @@
 "даже ценой потери свободы."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The question is how to try to change this."
 msgstr "Вопрос в том, что делать, чтобы 
изменить это."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Given that most of the community which uses GNU with Linux already does not "
 "realize that's what it is, for us to disown these adulterated versions, "
@@ -2420,13 +2479,29 @@
 "эти системы системами GNU."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The way to lead these users to see a connection with freedom is exactly
+# | the opposite: to inform them that all these system versions <em>are</em>
+# | versions of GNU, that they all are based on a system that exists
+# | specifically for the sake of the users' freedom.  With this understanding,
+# | they can start to recognize the distributions that include non[---]free
+# | software as perverted, adulterated versions of GNU, instead of thinking
+# | they are proper and appropriate &ldquo;versions of Linux&rdquo;.
+#, fuzzy
+#| msgid ""
+#| "The way to lead these users to see a connection with freedom is exactly "
+#| "the opposite: to inform them that all these system versions <em>are</em> "
+#| "versions of GNU, that they all are based on a system that exists "
+#| "specifically for the sake of the users' freedom.  With this "
+#| "understanding, they can start to recognize the distributions that include "
+#| "non-free software as perverted, adulterated versions of GNU, instead of "
+#| "thinking they are proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgid ""
 "The way to lead these users to see a connection with freedom is exactly the "
 "opposite: to inform them that all these system versions <em>are</em> "
 "versions of GNU, that they all are based on a system that exists "
 "specifically for the sake of the users' freedom.  With this understanding, "
-"they can start to recognize the distributions that include non-free software "
+"they can start to recognize the distributions that include nonfree software "
 "as perverted, adulterated versions of GNU, instead of thinking they are "
 "proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgstr ""
@@ -2439,7 +2514,7 @@
 "думать, что это приличные и допустимые 
&ldquo;версии Linux&rdquo;."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is very useful to start GNU/Linux User Groups, which call the system GNU/"
 "Linux and adopt the ideals of the GNU Project as a basis for their "
@@ -2458,7 +2533,7 @@
 "придерживаться своей позиции, однако не 
дайте им увлечь за собой и вас!"
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not make a GNU distribution of Linux (sic) and call that GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
@@ -2469,7 +2544,7 @@
 "\"#gnudist\">#gnudist</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "All the &ldquo;Linux&rdquo; distributions are actually versions of the GNU "
 "system with Linux as the kernel.  The purpose of the term &ldquo;GNU/"
@@ -2484,7 +2559,7 @@
 "бы ту идею, которую мы хотим высказать."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "As for developing a distribution of GNU/Linux, we already did this once, "
 "when we funded the early development of Debian GNU/Linux.  To do it again "
@@ -2500,7 +2575,7 @@
 "смысла."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Instead we help the developers of 100% free GNU/Linux distributions, such as "
 "gNewSense and Ututo."
@@ -2509,7 +2584,7 @@
 "Linux, таких, как gNewSense и Ututo."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not just say &ldquo;Linux is the GNU kernel&rdquo; and release some "
 "existing version of GNU/Linux under the name &ldquo;GNU&rdquo;? <span class="
@@ -2521,7 +2596,7 @@
 "\">#linuxgnu</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It might have been a good idea to adopt Linux as the GNU kernel back in "
 "1992.  If we had realized, then, how long it would take to get the GNU Hurd "
@@ -2533,7 +2608,7 @@
 "прошлого, увы, не вернешь)."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we were to take an existing version of GNU/Linux and relabel it as &ldquo;"
 "GNU&rdquo;, that would be somewhat like making a version of the GNU system "
@@ -2546,7 +2621,7 @@
 "хотим действовать подобным образом."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Did the GNU Project condemn and oppose use of Linux in the early days? <span "
 "class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
@@ -2556,7 +2631,7 @@
 "a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We did not adopt Linux as our kernel, but we didn't condemn or oppose it.  "
 "In 1993 we started discussing the arrangements to sponsor the development of "
@@ -2576,7 +2651,7 @@
 "перед принятием."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who had made the changes showed little interest in cooperating "
 "with us.  One of them actually told us that he didn't care about working "
@@ -2596,7 +2671,7 @@
 "желающей работать с нами."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It was this experience that first showed us that people were calling a "
 "version of the GNU system &ldquo;Linux&rdquo;, and that this confusion was "
@@ -2611,7 +2686,7 @@
 "неправильным названием &ldquo;Linux&rdquo;."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why did you wait so long before asking people to use the name GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
@@ -2621,7 +2696,7 @@
 "a>)</span>"
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually we didn't.  We began talking privately with developers and "
 "distributors about this in 1994, and made a more public campaign in 1996.  "
@@ -2633,7 +2708,7 @@
 "сколько потребуется."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should the GNU/<i>name</i> convention be applied to all programs that are "
 "GPL'ed? <span class=\"anchor-reference-id\">(<a href=\"#allgpled"
@@ -2644,7 +2719,7 @@
 "\"#allgpled\">#allgpled</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We never refer to individual programs as &ldquo;GNU/<i>name</i>&rdquo;.  "
 "When a program is a GNU package, we may call it &ldquo;GNU <i>name</"
@@ -2655,7 +2730,7 @@
 "&ldquo;GNU [название]&rdquo;."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU, the operating system, is made up of many different programs.  Some of "
 "the programs in GNU were written as part of the GNU Project or specifically "
@@ -2668,7 +2743,7 @@
 "GNU&rdquo; в их названии."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It's up to the developers of a program to decide if they want to contribute "
 "it and make it a GNU package.  If you have developed a program and you would "
@@ -2683,7 +2758,7 @@
 "решить, нужна ли она нам."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It wouldn't be fair to put the name GNU on every individual program that is "
 "released under the GPL.  If you write a program and release it under the "
@@ -2704,7 +2779,7 @@
 "заслугу, и прибавлять &ldquo;GNU&rdquo; к его 
названию было бы неуместно."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In contrast, we do deserve the overall credit for the GNU operating system "
 "as a whole, even though not for each and every program in it.  The system "
@@ -2718,7 +2793,7 @@
 "над Linux."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The operating system in which Linux became popular was basically the same as "
 "the GNU operating system.  It was not entirely the same, because it had a "
@@ -2731,7 +2806,7 @@
 "система. Это был один из вариантов GNU. Это 
была система GNU/Linux."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux continues to be used primarily in derivatives of that system&mdash;in "
 "today's versions of the GNU/Linux system.  What gives these systems their "
@@ -2744,7 +2819,7 @@
 "Linux, а не только ядро (Linux) само по себе."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since much of GNU comes from Unix, shouldn't GNU give credit to Unix by "
 "using &ldquo;Unix&rdquo; in its name? <span class=\"anchor-reference-id\">"
@@ -2755,7 +2830,7 @@
 "reference-id\">(<a href=\"#unix\">#unix</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Actually, none of GNU comes from Unix.  Unix was proprietary software (and "
 "still is), so using any of its code in GNU would have been illegal.  This is "
@@ -2773,7 +2848,7 @@
 "заново."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "No code in GNU comes from Unix, but GNU is a Unix-compatible system; "
 "therefore, many of the ideas and specifications of GNU do come from Unix.  "
@@ -2789,13 +2864,29 @@
 "благодарности Unix за это, в соответствии с х
акерской традицией использовать "
 "рекурсивные сокращения, появившейся в 
семидесятые годы."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.
+# |  The author of TINT wrote another implementation of TECO (there were
+# | already many of them, for various systems), but instead of calling it by a
+# | dull name like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of
+# | a clever amusing name.  (That's what hacking means: <a
+# | href=\"http{+s+}://stallman.org/articles/on-hacking.html\">playful
+# | cleverness</a>.)
+#, fuzzy
+#| msgid ""
+#| "The first such recursive acronym was TINT, &ldquo;TINT Is Not "
+#| "TECO&rdquo;.  The author of TINT wrote another implementation of TECO "
+#| "(there were already many of them, for various systems), but instead of "
+#| "calling it by a dull name like &ldquo;<em>somethingorother</em> "
+#| "TECO&rdquo;, he thought of a clever amusing name.  (That's what hacking "
+#| "means: <a href=\"http://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
 "The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
 "The author of TINT wrote another implementation of TECO (there were already "
 "many of them, for various systems), but instead of calling it by a dull name "
 "like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of a clever "
-"amusing name.  (That's what hacking means: <a href=\"http://stallman.org/";
+"amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
 "Первым таким рекурсивным сокращением 
было TINT, &ldquo;TINT Is Not "
@@ -2807,7 +2898,7 @@
 "\">игривое остроумие</a>.)"
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Other hackers enjoyed that name so much that we imitated the approach.  It "
 "became a tradition that, when you were writing from scratch a program that "
@@ -2825,7 +2916,7 @@
 "назвали нашу замену Unix &ldquo;GNU&nbsp;&mdash; это не 
Unix&rdquo;."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Historically, AT&amp;T which developed Unix did not want anyone to give it "
 "credit by using &ldquo;Unix&rdquo; in the name of a similar system, not even "
@@ -2842,7 +2933,7 @@
 "как Unix) имели совершенно иное название, 
которое не включало &ldquo;"
 "Unix&rdquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we say &ldquo;GNU/BSD&rdquo; too? <span class=\"anchor-reference-id\">"
 "(<a href=\"#bsd\">#bsd</a>)</span>"
@@ -2851,7 +2942,7 @@
 "reference-id\">(<a href=\"#bsd\">#bsd</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems, "
 "because that term does not fit the history of the BSD systems."
@@ -2860,9 +2951,19 @@
 "BSD&rdquo;, потому что этот термин не 
соответствует истории систем BSD."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | The BSD system was developed by UC Berkeley as non[---]free software in
+# | the 80s, and became free in the early 90s.  A free operating system that
+# | exists today is almost certainly either a variant of the GNU system, or a
+# | kind of BSD system.
+#, fuzzy
+#| msgid ""
+#| "The BSD system was developed by UC Berkeley as non-free software in the "
+#| "80s, and became free in the early 90s.  A free operating system that "
+#| "exists today is almost certainly either a variant of the GNU system, or a "
+#| "kind of BSD system."
 msgid ""
-"The BSD system was developed by UC Berkeley as non-free software in the 80s, "
+"The BSD system was developed by UC Berkeley as nonfree software in the 80s, "
 "and became free in the early 90s.  A free operating system that exists today "
 "is almost certainly either a variant of the GNU system, or a kind of BSD "
 "system."
@@ -2874,7 +2975,7 @@
 "разновидностью системы BSD."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "People sometimes ask whether BSD too is a variant of GNU, as GNU/Linux is.  "
 "It is not.  The BSD developers were inspired to make their code free "
@@ -2889,7 +2990,7 @@
 "текстами GNU частей."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "BSD systems today use some GNU packages, just as the GNU system and its "
 "variants use some BSD programs; however, taken as wholes, they are two "
@@ -2904,7 +3005,7 @@
 "&ldquo;GNU/BSD&rdquo; не подошло бы к ситуации."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The connection between GNU/Linux and GNU is much closer, and that's why the "
 "name &ldquo;GNU/Linux&rdquo; is appropriate for it."
@@ -2913,7 +3014,7 @@
 "Linux&rdquo; для нее подходит."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is a version of GNU which uses the kernel from NetBSD.  Its developers "
 "call it &ldquo;Debian GNU/NetBSD&rdquo;, but &ldquo;GNU/"
@@ -2928,7 +3029,7 @@
 "это та же система, что и GNU/Linux."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "If I install the GNU tools on Windows, does that mean I am running a GNU/"
 "Windows system? <span class=\"anchor-reference-id\">(<a href=\"#othersys"
@@ -2939,7 +3040,7 @@
 "\"#othersys\">#othersys</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
 "GNU are just a part of the GNU software, which is just a part of the GNU "
@@ -2953,7 +3054,7 @@
 "другая полная операционная система, у 
которой нет общих с GNU исходных "
 "текстов. В общем, это совершенно отличная 
от GNU/Linux ситуация."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can't Linux be used without GNU? <span class=\"anchor-reference-id\">(<a "
 "href=\"#justlinux\">#justlinux</a>)</span>"
@@ -2961,7 +3062,7 @@
 "Разве Linux нельзя использовать без GNU? <span 
class=\"anchor-reference-id\">"
 "(<a href=\"#justlinux\">#justlinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is used by itself, or with small other programs, in some appliances.  "
 "These small software systems are a far cry from the GNU/Linux system.  Users "
@@ -2977,7 +3078,7 @@
 "GNU/Linux, полезно говорить, что в этих 
приложениях работает только Linux."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How much of the GNU system is needed for the system to be GNU/Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
@@ -2986,7 +3087,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "&ldquo;How much&rdquo; is not a meaningful question because the GNU system "
 "does not have precise boundaries."
@@ -2994,7 +3095,7 @@
 "Вопрос &ldquo;какое количество?&rdquo; не имеет 
смысла, потому что у системы "
 "GNU нет точных границ."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is an operating system maintained by a community.  It includes far more "
 "than just the GNU software packages (of which we have a specific list), and "
@@ -3010,7 +3111,7 @@
 "GNU/Linux. Если вы пользуетесь частью системы 
GNU, а часть опускаете, нельзя "
 "осмысленно сказать, &ldquo;каким 
количеством&rdquo; вы пользуетесь."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we look at the level of packages, Linux is one important package in the "
 "GNU/Linux system.  The inclusion of one important GNU package is enough to "
@@ -3020,7 +3121,7 @@
 "системы GNU/Linux. Включение одного важного 
пакета GNU достаточно, чтобы "
 "оправдать нашу просьбу об упоминании на 
равных."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Are there complete Linux systems [sic] without GNU? <span class=\"anchor-"
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
@@ -3030,7 +3131,7 @@
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There are complete systems that contain Linux and not GNU; Android is an "
 "example.  But it is a mistake to call them &ldquo;Linux&rdquo; systems, just "
@@ -3041,7 +3142,7 @@
 "неправильно, точно так же, как неправильно 
называть GNU системой &ldquo;"
 "Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android is very different from the GNU/Linux system&mdash;because the two "
 "have very little code in common.  In fact, the only thing they have in "
@@ -3050,7 +3151,7 @@
 "Android сильно отличается от системы 
GNU/Linux&nbsp;&mdash; потому что у них "
 "очень мало общего. На самом деле общее у 
них только одно: Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
 "necessary to say things like, &ldquo;Android contains Linux, but it isn't "
@@ -3062,7 +3163,7 @@
 "Linux, потому что в нем нет обычных в Linux (так!) 
библиотек и утилит "
 "(подразумевая под этим систему GNU)&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android contains just as much of Linux as GNU/Linux does.  What it doesn't "
 "have is the GNU system.  Android replaces that with Google software that "
@@ -3074,7 +3175,7 @@
 "которые работают совсем по-другому. Android 
от системы GNU/Linux отличает "
 "именно отсутствие GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Is it correct to say &ldquo;using Linux&rdquo; if it refers to using GNU/"
 "Linux and using Android? <span class=\"anchor-reference-id\">(<a href="
@@ -3086,13 +3187,13 @@
 "reference-id\">(<a href=\"#usegnulinuxandandroidlinuxsyswithoutgnu"
 "\">#usegnulinuxandandroidlinuxsyswithoutgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Far from it.  That usage is so strained that people will not understand the "
 "intended meaning."
 msgstr "Отнюдь. Такое употребление настолько 
натянуто, что вас не поймут."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public will find it very strange to speak of using Android as &ldquo;"
 "using Linux&rdquo;.  It's like having a conversation, then saying you were "
@@ -3103,7 +3204,7 @@
 "как говорить об общении, а затем пояснять, 
что вы общались с кишечником или "
 "кровеносной системой человека."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public <em>will</em> understand the idea of &ldquo;using Linux&rdquo; "
 "when it's really GNU/Linux, by way of the usual misunderstanding: thinking "
@@ -3113,7 +3214,7 @@
 "когда это на самом деле GNU/Linux, благодаря 
обычному заблуждению: когда о "
 "системе в целом думают как о &ldquo;Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Use of Android and use of GNU/Linux are totally different, as different as "
 "driving a car and riding a bicycle.  The fact that the first two both "
@@ -3137,7 +3238,7 @@
 "GNU/Linux и Android&rdquo;."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not call the system &ldquo;Linux&rdquo; anyway, and strengthen Linus "
 "Torvalds' role as posterboy for our community? <span class=\"anchor-"
@@ -3149,7 +3250,7 @@
 "\">#helplinus</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Linus Torvalds is the &ldquo;posterboy&rdquo; (other people's choice of "
 "word, not ours) for his goals, not ours.  His goal is to make the system "
@@ -3169,12 +3270,30 @@
 "Linux&rdquo; с этим принципом."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | Linus publicly states his disagreement with the free software movement's
+# | ideals.  He developed non[---]free software in his job for many years (and
+# | said so to a large audience at a &ldquo;Linux&rdquo;World show), and
+# | publicly invited fellow developers of Linux, the kernel, to use
+# | non[---]free software to work on it with him.  He goes even further, and
+# | rebukes people who suggest that engineers and scientists should consider
+# | social consequences of our technical work&mdash;rejecting the lessons
+# | society learned from the development of the atom bomb.
+#, fuzzy
+#| msgid ""
+#| "Linus publicly states his disagreement with the free software movement's "
+#| "ideals.  He developed non-free software in his job for many years (and "
+#| "said so to a large audience at a &ldquo;Linux&rdquo;World show), and "
+#| "publicly invited fellow developers of Linux, the kernel, to use non-free "
+#| "software to work on it with him.  He goes even further, and rebukes "
+#| "people who suggest that engineers and scientists should consider social "
+#| "consequences of our technical work&mdash;rejecting the lessons society "
+#| "learned from the development of the atom bomb."
 msgid ""
 "Linus publicly states his disagreement with the free software movement's "
-"ideals.  He developed non-free software in his job for many years (and said "
+"ideals.  He developed nonfree software in his job for many years (and said "
 "so to a large audience at a &ldquo;Linux&rdquo;World show), and publicly "
-"invited fellow developers of Linux, the kernel, to use non-free software to "
+"invited fellow developers of Linux, the kernel, to use nonfree software to "
 "work on it with him.  He goes even further, and rebukes people who suggest "
 "that engineers and scientists should consider social consequences of our "
 "technical work&mdash;rejecting the lessons society learned from the "
@@ -3190,7 +3309,7 @@
 "несмотря на урок, который преподала 
обществу разработка атомной бомбы."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with writing a free program for the motivations of "
 "learning and having fun; the kernel Linus wrote for those reasons was an "
@@ -3209,7 +3328,7 @@
 "взгляды; однако люди должны знать, что 
корни операционной системы, о которой "
 "идет речь, лежат в идеалах свободы, а не в 
его мировоззрении."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong for us to label Linus Torvalds' work as GNU? <span class="
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
@@ -3219,7 +3338,7 @@
 "span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong, so we don't do that.  Torvalds' work is Linux, the "
 "kernel; we are careful not to attribute that work to the GNU Project or "
@@ -3231,7 +3350,7 @@
 "проекту GNU и не помечать ее как &ldquo;GNU&rdquo;. 
Когда мы говорим о "
 "системе в целом, название &ldquo;GNU/Linux&rdquo; 
отмечает и его заслуги."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Does Linus Torvalds agree that Linux is just the kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
@@ -3241,10 +3360,23 @@
 "a>)</span>"
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | He recognized this at the beginning.  The earliest Linux release notes
+# | said, <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | &ldquo;Most of the tools used with linux are GNU software and are under
+# | the GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
+# |  for more info&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
+#| "versions/RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are "
+#| "GNU software and are under the GNU copyleft. These tools aren't in the "
+#| "distribution - ask me (or GNU)  for more info&rdquo;</a>."
 msgid ""
 "He recognized this at the beginning.  The earliest Linux release notes said, "
-"<a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"<a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
 "RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are GNU software "
 "and are under the GNU copyleft. These tools aren't in the distribution - ask "
 "me (or GNU)  for more info&rdquo;</a>."
@@ -3256,7 +3388,7 @@
 "информацией&rdquo;<a href=\"#ft1\">[1]</a>."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not finish the GNU Hurd kernel, release the GNU system as a whole, and "
 "forget the question of what to call GNU/Linux? <span class=\"anchor-"
@@ -3266,7 +3398,7 @@
 "забыть вопрос о том, что называть GNU/Linux? <span 
class=\"anchor-reference-"
 "id\">(<a href=\"#finishhurd\">#finishhurd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We would like credit for the GNU operating system no matter which kernel is "
 "used with it."
@@ -3274,13 +3406,27 @@
 "Мы хотели бы, чтобы операционная система 
GNU получала признание независимо "
 "от того, с каким ядром она применяется."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+# | Making the GNU Hurd work well enough to compete with Linux would be a big
+# | job, and it's not clearly necessary.  The only thing ethically wrong with
+# | Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the
+# | best fix for that problem is <a
+# | [-href=\"http://fsf.org/campaigns/priority-projects\";>-]
+# | {+href=\"https://www.fsf.org/campaigns/priority-projects\";>+} developing
+# | free replacement for the blobs</a>.
+#, fuzzy
+#| msgid ""
+#| "Making the GNU Hurd work well enough to compete with Linux would be a big "
+#| "job, and it's not clearly necessary.  The only thing ethically wrong with "
+#| "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the "
+#| "best fix for that problem is <a href=\"http://fsf.org/campaigns/priority-";
+#| "projects\"> developing free replacement for the blobs</a>."
 msgid ""
 "Making the GNU Hurd work well enough to compete with Linux would be a big "
 "job, and it's not clearly necessary.  The only thing ethically wrong with "
 "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the best "
-"fix for that problem is <a href=\"http://fsf.org/campaigns/priority-projects";
-"\"> developing free replacement for the blobs</a>."
+"fix for that problem is <a href=\"https://www.fsf.org/campaigns/priority-";
+"projects\"> developing free replacement for the blobs</a>."
 msgstr ""
 "Доработать GNU Hurd до стадии, когда ядро 
могло бы потягаться с Linux, было "
 "бы большой работой, необходимость которой 
не очевидна. Единственное, что "
@@ -3290,7 +3436,7 @@
 "аналогов клякс</a>."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The battle is already lost&mdash;society has made its decision and we can't "
 "change it, so why even think about it? <span class=\"anchor-reference-id\">"
@@ -3301,7 +3447,7 @@
 "\">(<a href=\"#lost\">#lost</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This isn't a battle, it is a campaign of education.  What to call the system "
 "is not a single decision, to be made at one moment by &ldquo;society&rdquo;: "
@@ -3319,7 +3465,7 @@
 "других."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Society has made its decision and we can't change it, so what good does it "
 "do if I say &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id\">(<a "
@@ -3330,7 +3476,7 @@
 "\"anchor-reference-id\">(<a href=\"#whatgood\">#whatgood</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is not an all-or-nothing situation: correct and incorrect pictures are "
 "being spread more or less by various people.  If you call the system &ldquo;"
@@ -3352,7 +3498,7 @@
 "людей без особого труда. А некоторые из них
 передадут исправление дальше."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to call the system &ldquo;Linux&rdquo; and teach "
 "people its real origin with a ten-minute explanation? <span class=\"anchor-"
@@ -3363,7 +3509,7 @@
 "href=\"#explain\">#explain</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "If you help us by explaining to others in that way, we appreciate your "
 "effort, but that is not the best method.  It is not as effective as calling "
@@ -3375,7 +3521,7 @@
 "неэффективно расходует ваше время."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is ineffective because it may not sink in, and surely will not "
 "propagate.  Some of the people who hear your explanation will pay attention, "
@@ -3393,7 +3539,7 @@
 "намерения они будут помогать росту 
заблуждения."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is inefficient because it takes a lot more time.  Saying and writing "
 "&ldquo;GNU/Linux&rdquo; will take you only a few seconds a day, not minutes, "
@@ -3409,7 +3555,7 @@
 "GNU любым другим из эффективных способов."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people laugh at you when you ask them to call the system GNU/Linux.  "
 "Why do you subject yourself to this treatment? <span class=\"anchor-"
@@ -3420,7 +3566,7 @@
 "reference-id\">(<a href=\"#treatment\">#treatment</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; tends to give people a mistaken "
 "picture of the system's history and reason for existence.  People who laugh "
@@ -3436,7 +3582,7 @@
 "правду, они, вероятно, не смеялись бы."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Why do we take the risk of making a request that sometimes leads people to "
 "ridicule us? Because often it has useful results that help the GNU Project.  "
@@ -3448,7 +3594,7 @@
 "незаслуженных оскорблений ради 
достижения наших целей."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you see such an ironically unfair situation occurring, please don't sit "
 "idly by.  Please teach the laughing people the real history.  When they see "
@@ -3460,7 +3606,7 @@
 "справедлива, те, у кого есть хоть доля 
здравого смысла, смеяться перестанут."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people condemn you when you ask them to call the system GNU/Linux.  "
 "Don't you lose by alienating them? <span class=\"anchor-reference-id\">(<a "
@@ -3471,7 +3617,7 @@
 "reference-id\">(<a href=\"#alienate\">#alienate</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not much.  People who don't appreciate our role in developing the system are "
 "unlikely to make substantial efforts to help us.  If they do work that "
@@ -3489,7 +3635,7 @@
 "людей для помощи нам."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It makes no sense to worry about alienating people who are already mostly "
 "uncooperative, and it is self-defeating to be deterred from correcting a "
@@ -3503,7 +3649,7 @@
 "пытаться исправить неверное название."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Whatever you contributed, is it legitimate to rename the operating system? "
 "<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
@@ -3512,7 +3658,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are not renaming anything; we have been calling this system &ldquo;"
 "GNU&rdquo; ever since we announced it in 1983.  The people who tried to "
@@ -3523,7 +3669,7 @@
 "переименовать ее в &ldquo;Linux&rdquo;, не должны 
были это делать."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong to force people to call the system &ldquo;GNU/Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
@@ -3532,7 +3678,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong to force them, and we don't try.  We call the system "
 "&ldquo;GNU/Linux&rdquo;, and we ask you to do it too."
@@ -3541,7 +3687,7 @@
 "систему &ldquo;GNU/Linux&rdquo; и просим вас 
поступать так же."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not sue people who call the whole system &ldquo;Linux&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
@@ -3551,7 +3697,7 @@
 "\"#whynotsue\">#whynotsue</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are no legal grounds to sue them, but since we believe in freedom of "
 "speech, we wouldn't want to do that anyway.  We ask people to call the "
@@ -3563,7 +3709,7 @@
 "это правильно."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Shouldn't you put something in the GNU GPL to require people to call the "
 "system &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id\">(<a href="
@@ -3574,13 +3720,31 @@
 "\">#require</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
+# | The purpose of the GNU GPL is to protect the users' freedom from those who
+# | would make proprietary versions of free software.  While it is true that
+# | those who call the system &ldquo;Linux&rdquo; often do things that limit
+# | the users' freedom, such as bundling non[---]free software with the
+# | GNU/Linux system or even developing non[---]free software for such use,
+# | the mere act of calling the system &ldquo;Linux&rdquo; does not, in
+# | itself, deny users their freedom.  It seems improper to make the GPL
+# | restrict what name people can use for the system.
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU GPL is to protect the users' freedom from those "
+#| "who would make proprietary versions of free software.  While it is true "
+#| "that those who call the system &ldquo;Linux&rdquo; often do things that "
+#| "limit the users' freedom, such as bundling non-free software with the GNU/"
+#| "Linux system or even developing non-free software for such use, the mere "
+#| "act of calling the system &ldquo;Linux&rdquo; does not, in itself, deny "
+#| "users their freedom.  It seems improper to make the GPL restrict what "
+#| "name people can use for the system."
 msgid ""
 "The purpose of the GNU GPL is to protect the users' freedom from those who "
 "would make proprietary versions of free software.  While it is true that "
 "those who call the system &ldquo;Linux&rdquo; often do things that limit the "
-"users' freedom, such as bundling non-free software with the GNU/Linux system "
-"or even developing non-free software for such use, the mere act of calling "
+"users' freedom, such as bundling nonfree software with the GNU/Linux system "
+"or even developing nonfree software for such use, the mere act of calling "
 "the system &ldquo;Linux&rdquo; does not, in itself, deny users their "
 "freedom.  It seems improper to make the GPL restrict what name people can "
 "use for the system."
@@ -3595,7 +3759,7 @@
 "так, чтобы она ограничивала пользователей 
в выборе названия для системы."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you objected to the original BSD license's advertising requirement to "
 "give credit to the University of California, isn't it hypocritical to demand "
@@ -3608,7 +3772,7 @@
 "\"#BSDlicense\">#BSDlicense</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would be hypocritical to make the name GNU/Linux a license requirement, "
 "and we don't.  We only <em>ask</em> you to give us the credit we deserve."
@@ -3617,7 +3781,7 @@
 "этого не делаем. Мы только <em>просим</em> о 
признании, которого мы "
 "заслуживаем."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please note that there are at least <a href=\"/licenses/bsd.html\"> two "
 "different BSD licenses</a>.  For clarity's sake, please don't use the term "
@@ -3629,7 +3793,7 @@
 "лицензия."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you failed to put something in the GNU GPL to require people to call "
 "the system &ldquo;GNU&rdquo;, you deserve what happened; why are you "
@@ -3642,7 +3806,7 @@
 "\">#deserve</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The question presupposes a rather controversial general ethical premise: "
 "that if people do not force you to treat them fairly, you are entitled to "
@@ -3655,12 +3819,12 @@
 "сильнее, тот и прав."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope you disagree with that premise just as we do."
 msgstr "Мы надеемся, что вы не согласны с этим 
положением так же, как и мы."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't you be better off not contradicting what so many people believe? "
 "<span class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)"
@@ -3671,7 +3835,7 @@
 "\">#contradict</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't think we should go along with large numbers of people because they "
 "have been misled.  We hope you too will decide that truth is important."
@@ -3681,7 +3845,7 @@
 "важна."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We could never have developed a free operating system without first denying "
 "the belief, held by most people, that proprietary software was legitimate "
@@ -3692,7 +3856,7 @@
 "несвободное программное обеспечение 
законно и приемлемо."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
 "<span class=\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</"
@@ -3703,12 +3867,12 @@
 "a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "We don't think that the popularity of an error makes it the truth."
 msgstr "Мы не думаем, что популярность 
заблуждения обращает его в истину."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it better to call the system by the name most users already know? "
 "<span class=\"anchor-reference-id\">(<a href=\"#knownname\">#knownname</a>)</"
@@ -3718,7 +3882,7 @@
 "пользователей? <span class=\"anchor-reference-id\">(<a 
href=\"#knownname"
 "\">#knowname</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo; includes "
 "&ldquo;Linux&rdquo;, they will recognize what you're talking about.  If you "
@@ -3731,7 +3895,7 @@
 "&ldquo;Linux&rdquo;)&rdquo;, то все они это поймут."
 
 # type: Content of: <dl><dt>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many people care about what's convenient or who's winning, not about "
 "arguments of right or wrong.  Couldn't you get more of their support by a "
@@ -3744,12 +3908,24 @@
 "\"#winning\">#winning</a>)</span>"
 
 # type: Content of: <dl><dd>
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+# | To care only about what's convenient or who's winning is an amoral
+# | approach to life.  Non[---]free software is an example of that amoral
+# | approach and thrives on it.  Thus, in the long run it would be
+# | self-defeating for us to adopt that approach.  We will continue talking in
+# | terms of right and wrong.
+#, fuzzy
+#| msgid ""
+#| "To care only about what's convenient or who's winning is an amoral "
+#| "approach to life.  Non-free software is an example of that amoral "
+#| "approach and thrives on it.  Thus, in the long run it would be self-"
+#| "defeating for us to adopt that approach.  We will continue talking in "
+#| "terms of right and wrong."
 msgid ""
 "To care only about what's convenient or who's winning is an amoral approach "
-"to life.  Non-free software is an example of that amoral approach and "
-"thrives on it.  Thus, in the long run it would be self-defeating for us to "
-"adopt that approach.  We will continue talking in terms of right and wrong."
+"to life.  Nonfree software is an example of that amoral approach and thrives "
+"on it.  Thus, in the long run it would be self-defeating for us to adopt "
+"that approach.  We will continue talking in terms of right and wrong."
 msgstr ""
 "Заботиться лишь о том, что удобнее и кто 
выигрывает&nbsp;&mdash; это "
 "безнравственный подход к жизни. 
Несвободные программы представляют пример 
"
@@ -3758,7 +3934,7 @@
 "будем продолжать говорить в терминах 
добра и зла."
 
 # type: Content of: <dl><dd><p>
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope that you are one of those for whom right and wrong do matter."
 msgstr ""
 "Мы надеемся, что вы принадлежите к тем, для 
кого добро и зло имеют значение."
@@ -3814,13 +3990,18 @@
 
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
+# | Copyright &copy; [-2014, 2015, 2016, 2017, 2018, 2019-] {+2001-2011,
+# | 2013-2018, 2020, 2021+} Free Software Foundation, Inc.
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation, "
+"Inc."
 msgstr ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2012, 2013, 2014-2018, 2020, "
-"2021 Free Software Foundation, Inc.<br />Copyright &copy; 2010 Vladimir "
-"Smolyar (translation)"
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+"Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -3844,6 +4025,15 @@
 msgid "Updated:"
 msgstr "Обновлено:"
 
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
+#~ "Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2001, 2006-2008, 2010, 2011, 2012, 2013, 2014-2018, "
+#~ "2020, 2021 Free Software Foundation, Inc.<br />Copyright &copy; 2010 "
+#~ "Vladimir Smolyar (translation)"
+
 # type: Content of: <h2>
 #~ msgid "GNU/Linux FAQ by Richard Stallman"
 #~ msgstr "Ричард Столмен. Вопросы о GNU/Linux"

Index: gnu/po/gnu-linux-faq.sq.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.sq.po,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- gnu/po/gnu-linux-faq.sq.po  31 May 2021 11:30:23 -0000      1.117
+++ gnu/po/gnu-linux-faq.sq.po  30 Aug 2021 13:34:53 -0000      1.118
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-05-01 11:51+0300\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: sq\n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.4.2\n"
 
@@ -21,29 +22,15 @@
 msgid "GNU/Linux FAQ - GNU Project - Free Software Foundation"
 msgstr "PBR mbi GNU/Linux - Projekti GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU/Linux FAQ"
 msgstr "PBR mbi GNU/Linux-in"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by Richard Stallman"
 msgstr "nga Richard Stallman"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
-"linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a href=\"/"
-"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Për të mësuar më tepër rreth kësaj çështjeje, mund të lexoni 
gjithashtu "
-"faqen tonë mbi <a href=\"/gnu/linux-and-gnu.html\">Linux-in dhe Projektin "
-"GNU</a>, faqen tonë <a href=\"/gnu/why-gnu-linux.html\">Pse GNU/Linux?</a> "
-"dhe faqen tonë mbi <a href=\"/gnu/gnu-users-never-heard-of-gnu.html"
-"\">Përdorues të GNU-së Që Nuk Kanë Dëgjuar Kurrë Për GNU-në</a>."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When people see that we use and recommend the name GNU/Linux for a system "
 "that many others call just &ldquo;Linux&rdquo;, they ask many questions.  "
@@ -53,6 +40,12 @@
 "sistem që mjaft të tjerë thjesht e quajnë “Linux”, atyre u lindin 
shumë "
 "pyetje.  Ja pyetjet e bëra rëndom, dhe përgjigjet tona."
 
+#. type: Content of: <div><div><h3>
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "Tryeza e Lëndës"
+
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<a href=\"#why\">Why do you call the system we use GNU/Linux and not Linux?</"
@@ -647,7 +640,28 @@
 "apo se kush po fiton, jo rreth argumenteve të drejtë apo të gabuar.  A nuk 
"
 "mund ta përthithni mbështetjen e tyre përmes një rruge tjetër?</a>"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our page on <a href=\"/"
+#| "gnu/linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a "
+#| "href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
+"linux-and-gnu.html\">Linux and the GNU System</a>, our page on <a href=\"/"
+"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Për të mësuar më tepër rreth kësaj çështjeje, mund të lexoni 
gjithashtu "
+"faqen tonë mbi <a href=\"/gnu/linux-and-gnu.html\">Linux-in dhe Projektin "
+"GNU</a>, faqen tonë <a href=\"/gnu/why-gnu-linux.html\">Pse GNU/Linux?</a> "
+"dhe faqen tonë mbi <a href=\"/gnu/gnu-users-never-heard-of-gnu.html"
+"\">Përdorues të GNU-së Që Nuk Kanë Dëgjuar Kurrë Për GNU-në</a>."
+
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you call the system we use GNU/Linux and not Linux? <span class="
 "\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>"
@@ -655,7 +669,7 @@
 "Pse e quani GNU/Linux dhe jo Linux? <span class=\"anchor-reference-id\">(<a "
 "href=\"#why\">#why</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Most operating system distributions based on Linux as kernel are basically "
 "modified versions of the GNU operating system.  We began developing GNU in "
@@ -674,11 +688,11 @@
 "kontributin më të madh si njësi më vete te krejt sistemi.  I yni qe edhe "
 "përfytyrimi bazë."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "In fairness, we ought to get at least equal mention."
 msgstr "Pa hile, të paktën duhet të përmendemi njësoj."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and the GNU System</a> and <a "
 "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
@@ -690,7 +704,7 @@
 "\">Përdorues të GNU-së Që Nuk Kanë Dëgjuar Kurrë Për GNU-në</a>, dhe 
<a href="
 "\"/gnu/the-gnu-project.html\">Projekti GNU</a>, për historikun."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why is the name important? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
@@ -698,7 +712,7 @@
 "Pse ka rëndësi emri? <span class=\"anchor-reference-id\">(<a 
href=\"#whycare"
 "\">#whycare</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Although the developers of Linux, the kernel, are contributing to the free "
 "software community, many of them do not care about freedom.  People who "
@@ -713,7 +727,7 @@
 "nuk e kanë luajtur.  Mandej u japin peshë të shpërpjesëtuar ideve të 
këtyre "
 "zhvilluesve."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Calling the system GNU/Linux recognizes the role that our idealism played in "
 "building our community, and <a href=\"/gnu/why-gnu-linux.html\">helps the "
@@ -723,7 +737,7 @@
 "krijimin e bashkësisë sonë, dhe <a href=\"/gnu/why-gnu-linux.html\"> "
 "ndihmohet publiku të pranojë rëndësinë praktike të këtyre 
idealeve</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the real relationship between GNU and Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#what\">#what</a>)</span>"
@@ -731,7 +745,7 @@
 "Cila është marrëdhënia e vërtetë mes GNU-së dhe Linux-it? <span class="
 "\"anchor-reference-id\">(<a href=\"#what\">#what</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU operating system and the Linux kernel are separate software projects "
 "that do complementary jobs.  Typically they are packaged in a <a href=\"/"
@@ -742,7 +756,7 @@
 "paketuar në një <a href=\"/distros/distros.html\">shpërndarje 
GNU/Linux</a>, "
 "dhe përdoren së bashku."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How did it come about that most people call the system &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
@@ -751,7 +765,7 @@
 "Si ndodhi që shumica e njerëzve e quan sistemin “Linux”? <span class="
 "\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; is a confusion that has spread faster "
 "than the corrective information."
@@ -759,7 +773,7 @@
 "Ta quash sistemin “Linux” është ngatërrim që u përhap më shpejt se 
sa "
 "informacioni i saktë."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who combined Linux with the GNU system were not aware that that's "
 "what their activity amounted to.  They focused their attention on the piece "
@@ -776,7 +790,7 @@
 "të kuptonim se ku qe problemi këtu dhe t’u kërkonim njerëzve ta 
ndreqnin "
 "këtë praktikë.  Në atë kohë, ngatërrimi pat filluar duke qenë më 
para."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the people who call the system &ldquo;Linux&rdquo; have never heard "
 "why that's not the right thing.  They saw others using that name and assume "
@@ -795,7 +809,7 @@
 "Torvalds-in më 1991.  Kjo pamje e rreme priret të përforcojë idenë se "
 "sistemi do të duhej quajtur “Linux”."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Many of the questions in this file represent people's attempts to justify "
 "the name they are accustomed to using."
@@ -803,7 +817,7 @@
 "Mjaft nga pyetjet këtu përfaqësojnë përpjekjet e njerëzve për të 
përligjur "
 "emrin që janë mësuar të përdorin."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we always say &ldquo;GNU/Linux&rdquo; instead of &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
@@ -811,7 +825,7 @@
 "Duhet përherë të themi “GNU/Linux” në vend se “Linux”? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not always&mdash;only when you're talking about the whole system.  When "
 "you're referring specifically to the kernel, you should call it &ldquo;"
@@ -820,7 +834,7 @@
 "Jo përherë&mdash;vetëm kur flisni mbi sistemin si i tërë.  Kur i 
referoheni "
 "veçan kernelit, duhet ta quani “Linux”, me emrin që i zgjodhi 
programuesi."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
 "call the whole system by the same name as the kernel.  This causes many "
@@ -835,7 +849,7 @@
 "apo me krejt sistemin.  Duke e quajtur krejt sistemin “GNU/Linux”, dhe "
 "kernelin “Linux”, shmangni dykuptimësinë."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Would Linux have achieved the same success if there had been no GNU? <span "
 "class=\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</"
@@ -845,7 +859,7 @@
 "GNU? <span class=\"anchor-reference-id\">(<a href=\"#linuxalone"
 "\">#linuxalone</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In that alternative world, there would be nothing today like the GNU/Linux "
 "system, and probably no free operating system at all.  No one attempted to "
@@ -859,7 +873,7 @@
 "(më pas) Berkeley CSRG, të cilit i qe kërkuar shprehimisht nga Projekti 
GNU "
 "të fillonte e ta bënte kodin të lirë."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds was partly influenced by a speech about GNU in Finland in "
 "1990.  It's possible that even without this influence he might have written "
@@ -873,7 +887,7 @@
 "em> i lirë.  Linux-i u bë i lirë më 1992 kur Linus e rihodhi në 
qarkullim "
 "nën GNU GPL.  (Shihni shënime versioni për versionin 0.12.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Even if Torvalds had released Linux under some other free software license, "
 "a free kernel alone would not have made much difference to the world.  The "
@@ -886,7 +900,7 @@
 "vendit që zinte në një kuadër më të gjerë pune, një sistem operativ "
 "krejtësisht të lirë: GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better for the community if you did not divide people with "
 "this request? <span class=\"anchor-reference-id\">(<a href=\"#divide"
@@ -896,7 +910,7 @@
 "këtë kërkesë? <span class=\"anchor-reference-id\">(<a href=\"#divide"
 "\">#divide</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
 "people.  We are asking them to give the GNU Project credit for the GNU "
@@ -906,7 +920,7 @@
 "u kërkojmë t’i njohin hakun Projektit GNU për sistemin operativ GNU.  
Kjo "
 "nuk është kritikë për ndonjë, e as hedhje tutje e dikujt."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, there are people who do not like our saying this.  Sometimes those "
 "people push us away in response.  On occasion they are so rude that one "
@@ -920,7 +934,7 @@
 "bëjnë të heshtim.  Gojën nuk na e mbyllin dot, por bashkësisë ia japin 
një "
 "krisje, ndaj shpresojmë që të arrini t’i bindni të reshtin së bëri 
kështu."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, this is only a secondary cause of division in our community.  The "
 "largest division in the community is between people who appreciate free "
@@ -937,7 +951,7 @@
 "software-in e lirë vetëm si model të efektshëm zhvillimi (lëvizja për 
burim "
 "të hapur)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This disagreement is not just a matter of names&mdash;it is a matter of "
 "differing basic values.  It is essential for the community to see and think "
@@ -953,7 +967,7 @@
 "misses-the-point.html\">Pse Burimi i Hapur nuk e rrok thelbin e Software-it "
 "të Lirë</a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The disagreement over values partially aligns with the amount of attention "
 "people pay to the GNU Project's role in our community.  People who value "
@@ -978,7 +992,7 @@
 "çmojmë lirinë, bindim gjithsecilin (çka nuk do të jetë e lehtë), ose 
na "
 "mundin plotësisht (le të shpresojmë se jo)."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Doesn't the GNU project support an individual's free speech rights to call "
 "the system by any name that individual chooses? <span class=\"anchor-"
@@ -988,7 +1002,7 @@
 "quajë sistemin me çfarëdo emri që ai zgjedh? <span 
class=\"anchor-reference-"
 "id\">(<a href=\"#freespeech\">#freespeech</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Yes, indeed, we believe you have a free speech right to call the operating "
 "system by any name you wish.  We ask that people call it GNU/Linux as a "
@@ -1002,7 +1016,7 @@
 "lirisë të cilat nënkuptohen me GNU-në, dhe për t’u bërë të ditur 
të tjerëve "
 "që sistemin e pollën këto vlera të lirisë."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since everyone knows the role of GNU in developing the system, doesn't the "
 "&ldquo;GNU/&rdquo; in the name go without saying? <span class=\"anchor-"
@@ -1012,7 +1026,7 @@
 "thuhet patjetër “GNU/”-ja te emri? <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#everyoneknows\">#everyoneknows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Experience shows that the system's users, and the computer-using public in "
 "general, often know nothing about the GNU system.  Most articles about the "
@@ -1026,7 +1040,7 @@
 "përfaqëson GNU-ja.  Kjo trajtohet më gjerë te <a 
href=\"/gnu/gnu-users-never-"
 "heard-of-gnu.html\">Përdorues GNU Që Nuk Kanë Dëgjuar Kurrë Për 
GNU-në</a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who say this are probably geeks thinking of the geeks they know.  "
 "Geeks often do know about GNU, but many have a completely wrong idea of what "
@@ -1039,7 +1053,7 @@
 "mjaft prej tyre mendojnë se është një koleksion <a href=\"#tools"
 "\">“mjetesh”</a>, ose një projekt për zhvillim mjetesh."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The wording of this question, which is typical, illustrates another common "
 "misconception.  To speak of &ldquo;GNU's role&rdquo; in developing something "
@@ -1053,7 +1067,7 @@
 "operativ.  Mund të kish kuptim të flitej rreth rolit të Projektit GNU në "
 "këtë apo në atë veprimtari, por jo në atë të GNU-së."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since I know the role of GNU in this system, why does it matter what name I "
 "use? <span class=\"anchor-reference-id\">(<a href="
@@ -1063,7 +1077,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#everyoneknows2\">#everyoneknows2</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your words don't reflect your knowledge, you don't teach others.  Most "
 "people who have heard of the GNU/Linux system think it is &ldquo;"
@@ -1075,7 +1089,7 @@
 "se është “Linux”, që zuri fill me Linus Torvalds-in, dhe se qe menduar 
të "
 "ishte me “burim të hapur”;.  Nëse nuk ua thoni ju, kush do t’ua 
thotë?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't shortening &ldquo;GNU/Linux&rdquo; to &ldquo;Linux&rdquo; just like "
 "shortening &ldquo;Microsoft Windows&rdquo; to &ldquo;Windows&rdquo;? <span "
@@ -1085,7 +1099,7 @@
 "“Microsoft Windows”-it në “Windows”? <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#windows\">#windows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It's useful to shorten a frequently-used name, but not if the abbreviation "
 "is misleading."
@@ -1093,7 +1107,7 @@
 "Është i dobishëm shkurtimi i emrave që përdoren shpesh, por jo kur 
shkurtimi "
 "të ngatërron."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Almost everyone in developed countries really does know that the &ldquo;"
 "Windows&rdquo; system is made by Microsoft, so shortening &ldquo;Microsoft "
@@ -1107,7 +1121,7 @@
 "sistemi.  Shkurtimi i “GNU/Linux-it” në “Linux” jep ide të gabuar 
lidhur me "
 "se nga rrjedh sistemi."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The question is itself misleading because GNU and Microsoft are not the same "
 "kind of thing.  Microsoft is a company; GNU is an operating system."
@@ -1115,7 +1129,7 @@
 "Vetë pyetja është ngatërruese, ngaqë GNU dhe Microsoft nuk janë nga i 
njëjti "
 "lloj gjërash.  Microsoft është një shoqëri; GNU është një sistem 
operativ."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't GNU a collection of programming tools that were included in Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
@@ -1123,7 +1137,7 @@
 "A s’është GNU një koleksion mjetesh programimi që u përfshinë në 
Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "People who think that Linux is an entire operating system, if they hear "
 "about GNU at all, often get a wrong idea of what GNU is.  They may think "
@@ -1141,7 +1155,7 @@
 "është emri i një sistemi operativ nuk hyn lehtë në një kuadër 
konceptual "
 "pune te i cili ai sistem operativ është quajtur “Linux”."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Project was named after the GNU operating system&mdash;it's the "
 "project to develop the GNU system.  (See <a href=\"/gnu/initial-announcement."
@@ -1151,7 +1165,7 @@
 "projekti për zhvillimin e sistemit GNU.  (Shihni <a href=\"/gnu/initial-"
 "announcement.html\">njoftimin fillestar të 1983-it</a>.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We developed programs such as GCC, GNU Emacs, GAS, GLIBC, BASH, etc., "
 "because we needed them for the GNU operating system.  GCC, the GNU Compiler "
@@ -1165,7 +1179,7 @@
 "punuan në Projektin GNU, hartuan edhe Ghostscript, GNUCash, GNU Chess dhe "
 "GNOME për sistemin GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the difference between an operating system and a kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
@@ -1173,7 +1187,7 @@
 "Ç’ndryshim ka mes një sistemi operativ dhe një kerneli? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "An operating system, as we use the term, means a collection of programs that "
 "are sufficient to use the computer to do a wide variety of jobs.  A general "
@@ -1186,7 +1200,7 @@
 "plotë, duhet të përmbushë krejt detyrat që u duhet të kryejnë një 
numri sa "
 "më të madh përdoruesish."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The kernel is one of the programs in an operating system&mdash;the program "
 "that allocates the machine's resources to the other programs that are "
@@ -1196,7 +1210,7 @@
 "shpërndan mundësitë e makinës programeve të tjera që xhirohen.  Kerneli 
"
 "kujdeset gjithashtu për nisjen dhe ndalimin e programeve të tjera."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "To confuse matters, some people use the term &ldquo;operating system&rdquo; "
 "to mean &ldquo;kernel&rdquo;.  Both uses of the term go back many years.  "
@@ -1217,7 +1231,7 @@
 "GNU të ishte sistem operativ i ngjashëm me Unix, e përdorim termin 
“sistem "
 "operativ” në të njëjtën mënyrë."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the time when people speak of the &ldquo;Linux operating "
 "system&rdquo; they are using &ldquo;operating system&rdquo; in the same "
@@ -1235,7 +1249,7 @@
 "por ju lutemi, thoni “kerneli” po ashtu, për të shmangur 
dykuptimësinë "
 "lidhur se për cilën pjesë software-i e keni fjalën."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
@@ -1247,7 +1261,7 @@
 "“sistemit operativ”, asnjë problem.  Në raste të tilla do të flitnit 
për "
 "shpërndarje sistemi GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The kernel of a system is like the foundation of a house.  How can a house "
 "be almost complete when it doesn't have a foundation? <span class=\"anchor-"
@@ -1257,7 +1271,7 @@
 "e mbaruar një shtëpi që nuk ka themele? <span 
class=\"anchor-reference-id\">"
 "(<a href=\"#house\">#house</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "A kernel is not much like the foundation of a house because building an "
 "operating system is not much like building a house."
@@ -1265,7 +1279,7 @@
 "Kerneli nuk krahasohet me themelet e një banese, ngaqë ndërtimi i një "
 "sistemi operativ nuk i ngjan ndërtimit të një banese."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A house is built from lots of little general parts that are cut and put "
 "together in situ.  They have to be put together from the bottom up.  Thus, "
@@ -1277,7 +1291,7 @@
 "se nuk janë ndërtuar themelet, nuk ndërton dot ndonjë pjesë thelbësore; 
ajo "
 "çka keni, është një gropë në terren."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "By contrast, an operating system consists of complex components that can be "
 "developed in any order.  When you have developed most of the components, "
@@ -1293,7 +1307,7 @@
 "qenë në orbitë por po pritej për një modul tjetër thelbësor, kjo do 
t’i "
 "ngjante sistemit GNU më 1992."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't the kernel the brain of the system? <span class=\"anchor-reference-id"
 "\">(<a href=\"#brain\">#brain</a>)</span>"
@@ -1301,7 +1315,7 @@
 "A s’është kerneli truri i sistemit? <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#brain\">#brain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A computer system is not much like a human body, and no part of it plays a "
 "role comparable to that of the brain in a human."
@@ -1310,7 +1324,7 @@
 "e tij nuk luan ndonjë rol të krahasueshëm me atë të trurit te qenia "
 "njerëzore."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't writing the kernel most of the work in an operating system? <span "
 "class=\"anchor-reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</"
@@ -1320,11 +1334,11 @@
 "operativ? <span class=\"anchor-reference-id\">(<a href=\"#kernelmost"
 "\">#kernelmost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "No, many components take a lot of work."
 msgstr "Jo, shumë përbërës duan mjaft punë."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "An operating system requires a kernel.  Since the GNU Project didn't develop "
 "a kernel, how can the system be GNU?<span class=\"anchor-reference-id\">(<a "
@@ -1334,7 +1348,7 @@
 "s’zhvilloi ndonjë kernel, si mund të jetë sistemi GNU?<span 
class=\"anchor-"
 "reference-id\">(<a href=\"#nokernel\">#nokernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The people who argue that way for calling the system &ldquo;Linux&rdquo; are "
 "using a double standard.  An operating system requires compilers, editors, "
@@ -1349,7 +1363,7 @@
 "përfshinin më 1983-shin.  Nga Torvalds nuk zhvilloi ndonjë prej tyre, si "
 "mund të jetë sistemi &ldquo;Linux&rdquo;?"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "That standard is too strict, not the right way to judge the contributions of "
 "any contributor."
@@ -1357,7 +1371,7 @@
 "Ai standard është shumë strikt, jo rruga e duhur për të gjykuar 
kontributet "
 "e cilitdo kontribues."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds made an important contribution to the operating system we "
 "use; the GNU Project started earlier and contributed much more.  The name "
@@ -1367,7 +1381,7 @@
 "përdorim; Projekti GNU filloi më herët dhe kontribuoi shumë më tepër.  
Emri "
 "&ldquo;GNU/Linux&rdquo; i jep hakën secilit."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How can GNU be an operating system, if I can't get something called &ldquo;"
 "GNU&rdquo; and install it? <span class=\"anchor-reference-id\">(<a href="
@@ -1377,7 +1391,7 @@
 "diçka të quajtur “GNU”? <span class=\"anchor-reference-id\">(<a href="
 "\"#notinstallable\">#notinstallable</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Many <a href=\"/distros/distros.html\"> packaged and installable versions of "
 "GNU</a> are available.  None of them is called simply &ldquo;GNU&rdquo;, but "
@@ -1387,7 +1401,7 @@
 "të instalueshme të GNU-së</a>.  Asnjë prej tyre nuk është quajtur 
thjesht "
 "“GNU”, por GNU është ajo çka ata janë në thelb."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We expected to release the GNU system packaged for installation, but this "
 "plan was overtaken by events: in 1992 others were already packaging GNU "
@@ -1407,7 +1421,7 @@
 "emër.  Nuk i kërkuam ta quante thjesht “GNU”, ngaqë ai do të ishte 
emri i "
 "një versioni të sistemit me kernelin GNU Hurd&mdash;i cili ende nuk qe 
gati."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Hurd kernel never became sufficiently ready; we only recommend it to "
 "those interested in working on it.  So we never packaged GNU with the GNU "
@@ -1417,7 +1431,7 @@
 "atyre që duan të merren me të.  Pra, nuk e paketuam kurrë GNU-në me 
kernelin "
 "GNU Hurd.  Megjithatë, Debian-i e paketoi këtë ndërthurje si Debian 
GNU/Hurd."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are now developing an advanced Scheme-based package manager called Guix "
 "and a complete system distribution based on it called the <a href=\"/"
@@ -1429,7 +1443,7 @@
 "href=\"/software/guix\">Guix System Distribution</a> ose GuixSD.  Kjo "
 "përfshin një ripaketim të një pjese domethënëse të sistemit GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We never took the last step of packaging GNU under the name &ldquo;"
 "GNU&rdquo;, but that doesn't alter what kind of thing GNU is.  GNU is an "
@@ -1439,7 +1453,7 @@
 "kjo nuk ndryshon gjë rreth asaj se çfarë është GNU-ja.  GNU-ja është 
një "
 "sistem operativ."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "We're calling the whole system after the kernel, Linux.  Isn't it normal to "
 "name an operating system after a kernel? <span class=\"anchor-reference-id\">"
@@ -1449,7 +1463,7 @@
 "normale të thirret një sistem operativ me emrin e kernelit? <span class="
 "\"anchor-reference-id\">(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "That practice seems to be very rare&mdash;we can't find any examples other "
 "than the misuse of the name &ldquo;Linux&rdquo;.  Normally an operating "
@@ -1465,7 +1479,7 @@
 "emër të vetin&mdash;në vend të tij, njerëzit thonë “kerneli i atij 
ose "
 "këtij“ ose “kerneli për këtë ose atë“."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Because those two constructions are used synonymously, the expression &ldquo;"
 "the Linux kernel&rdquo; can easily be misunderstood as meaning &ldquo;the "
@@ -1479,7 +1493,7 @@
 "shmangni mundësinë e këtij keqkuptimi duke thënë ose shkruar “kerneli, 
Linux-"
 "i” ose “Linux-i, kerneli”."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can another system have &ldquo;the feel of Linux&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
@@ -1487,7 +1501,7 @@
 "A mundet një sistem tjetër të japë “ndjesitë e Linux-it”? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is no such thing as the &ldquo;feel of Linux&rdquo; because Linux has "
 "no user interfaces.  Like any modern kernel, Linux is a base for running "
@@ -1501,7 +1515,7 @@
 "i njeriut me GNU/Linux-i kalon përherë përmes programesh të tjera, dhe "
 "“ndjesitë” vijnë prej tyre."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  How about "
 "recommending a shorter name? <span class=\"anchor-reference-id\">(<a href="
@@ -1511,7 +1525,7 @@
 "këshillonit një emër më të shkurtër? <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#long\">#long</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "For a while we tried the name &ldquo;LiGNUx&rdquo;, which combines the words "
 "&ldquo;GNU&rdquo; and &ldquo;Linux&rdquo;.  The reaction was very bad.  "
@@ -1521,7 +1535,7 @@
 "Kundërshtimi qe shumë i hidhët.   Njerëzit e pranojnë “GNU/Linux” 
shumë më "
 "mirë."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
 "call it &ldquo;GNU/Linux&rdquo; <a href=\"#justgnu\"> for the reasons given "
@@ -1530,7 +1544,7 @@
 "Emri më i shkurtër i ligjëruar për këtë sistem është “GNU”, por e 
quajmë "
 "“GNU/Linux” <a href=\"#justgnu\"> për arsyet e dhëna më poshtë</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How about calling the system &ldquo;GliNUx&rdquo; (instead of &ldquo;GNU/"
 "Linux&rdquo;)? <span class=\"anchor-reference-id\">(<a href="
@@ -1539,7 +1553,7 @@
 "Po sikur sistemi të quhej “GliNUx” (në vend se “GNU/Linux”)? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#long1\">#long1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The name &ldquo;GNU&rdquo; does not visibly appear in &ldquo;Glinux,&rdquo; "
 "so most people would not notice it is there.  Even if it is capitalized as "
@@ -1550,7 +1564,7 @@
 "vinin re.  Edhe pse shkruar me të mëdha, si “GliNUx”, shumica e 
njerëzve "
 "s’do ta kapnin dot se përmban një referencë ndaj GNU-së."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be comparable to writing &ldquo;GNU/Linux,&rdquo; but putting "
 "&ldquo;GNU/&rdquo; in print so small that most people could not read it."
@@ -1558,7 +1572,7 @@
 "Do të ishte sikur të shkruhej “GNU/Linux”, por me “GNU/” me 
shkronja kaq të "
 "vogla saqë shumica e njerëzve s’do ta lexonin dot."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  Why should "
 "I go to the trouble of saying &ldquo;GNU/&rdquo;? <span class=\"anchor-"
@@ -1568,7 +1582,7 @@
 "hapja punë vetes duke thënë “GNU/”? <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#long2\">#long2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
 "the system that we developed, can't you take one second to recognize our "
@@ -1578,7 +1592,7 @@
 "sistemin që ne ndërtuam, a nuk mund të shpenzoni një sekondë që të "
 "mirënjihet vepra jonë?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Unfortunately, &ldquo;GNU/Linux&rdquo; is five syllables. People won't use "
 "such a long term. Shouldn't you find a shorter one? <span class=\"anchor-"
@@ -1588,7 +1602,7 @@
 "përdorur një term kaq të gjatë. Mos do të duhej të gjeni një më të 
shkurtër? "
 "<span class=\"anchor-reference-id\">(<a href=\"#long3\">#long3</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, &ldquo;GNU/Linux&rdquo; is only four syllables.  &ldquo;"
 "Unfortunately&rdquo; is five syllables, yet people show no sign of "
@@ -1598,7 +1612,7 @@
 "katër rrokje, dhe megjithatë njerëzit nuk tregojnë ngurrim për ta 
përdorur "
 "atë fjalë."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Stallman doesn't ask us to call him &ldquo;Richard Matthew Stallman&rdquo; "
 "every the time.  So why ask us to say &ldquo;GNU/Linux&rdquo; every time? "
@@ -1608,7 +1622,7 @@
 "çdo herë.  Pse ju na kërkoni të themi &ldquo;GNU/Linux&rdquo; çdo herë? 
"
 "<span class=\"anchor-reference-id\">(<a href=\"#long4\">#long4</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Omitting &ldquo;Matthew&rdquo; does not misrepresent anything important "
 "about Stallman's nature, origin, ideas or purpose.  Omitting &ldquo;"
@@ -1619,7 +1633,7 @@
 "përmendur e &ldquo;GNU&rdquo;-së s’i përfaqëson këto gjëra rrett 
sistemit "
 "GNU/Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is an example of a frequent way of hiding a fallacy: to bury it inside "
 "a misleading analogy.  A better analogy would be, &ldquo;Why shouldn't we "
@@ -1630,7 +1644,7 @@
 "mirë do të ishte, &ldquo;Pse të mos e quajmë Stallman-in &lsquo;"
 "Torvalds&rsquo;?&rdquo;"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since Linux is a secondary contribution, would it be false to the facts to "
 "call the system simply &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id"
@@ -1640,7 +1654,7 @@
 "quhej sistemi thjesht “GNU”? <span class=\"anchor-reference-id\">(<a 
href="
 "\"#justgnu\">#justgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would not be false to the facts, but it is not the best thing to do.  "
 "Here are the reasons we call that system version &ldquo;GNU/Linux&rdquo; "
@@ -1650,7 +1664,7 @@
 "bëhet.  Ja arsyet pse e quajmë atë version të sistemit “GNU/Linux” 
në vend "
 "se thjesht “GNU”:"
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It's not exactly GNU&mdash;it has a different kernel (that is, Linux).  "
 "Distinguishing GNU/Linux from GNU is useful."
@@ -1658,7 +1672,7 @@
 "Nuk është saktësisht GNU&mdash;ka tjetër kernel (po, Linux).  Të dallosh 
GNU/"
 "Linux nga GNU është e dobishme."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It would be ungentlemanly to ask people to <em>stop</em> giving any credit "
 "to Linus Torvalds.  He did write an important component of the system.  We "
@@ -1677,7 +1691,7 @@
 "politike, prerazi, por e trajtojmë këtë mospajtim me ndershmëri dhe 
haptazi, "
 "në vend se të përpiqemi që t’i hamë hakun për kontributin e tij te 
sistemi."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
 "&ldquo;GNU&rdquo; they may simply not recognize we're talking about the same "
@@ -1688,7 +1702,7 @@
 "thjesht mund të mos kuptojnë që po flasim për të njëjtin sistem.  Po 
të "
 "themi “GNU/Linux”, mund ta lidhin këtë me çfarë kanë dëgjuar rreth 
temës."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "I would have to pay a fee if I use &ldquo;Linux&rdquo; in the name of a "
 "product, and that would also apply if I say &ldquo;GNU/Linux&rdquo;.  Is it "
@@ -1701,7 +1715,7 @@
 "gabim të përdor vetëm “GNU” pa “Linux”, që të kursej pagesën? 
<span class="
 "\"anchor-reference-id\">(<a href=\"#trademarkfee\">#trademarkfee</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There's nothing wrong in calling the system &ldquo;GNU&rdquo;; basically, "
 "that's what it is.  It is nice to give Linus Torvalds a share of the credit "
@@ -1711,7 +1725,7 @@
 "është.  Është bukur t’i jepet Linus Torvalds-it po ashtu një pjesë e 
hakës, "
 "por nuk keni ndonjë borxh, për ta larë me privilegjin e të bërit 
kështu."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "So if you want to refer to the system simply as &ldquo;GNU&rdquo;, to avoid "
 "paying the fee for calling it &ldquo;Linux&rdquo;, we won't criticize you."
@@ -1719,7 +1733,7 @@
 "Pra, nëse doni t’i referoheni sistemit thjesht si “GNU”, për shmangie 
pagese "
 "ngaqë e quani “Linux”, nuk do t’ju kritikojmë."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today; it includes "
 "TeX, X11, Apache, Perl, and many more programs.  Don't your arguments imply "
@@ -1733,7 +1747,7 @@
 "shpinte në një emër kaq të gjatë sa do të ishte pa kuptim.) <span 
class="
 "\"anchor-reference-id\">(<a href=\"#many\">#many</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "What we say is that you ought to give the system's principal developer a "
 "share of the credit.  The principal developer is the GNU Project, and the "
@@ -1743,7 +1757,7 @@
 "themelor të sistemit.  Zhvilluesi kryesor është Projekti GNU, dhe sistemi 
në "
 "thelb është GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you feel even more strongly about giving credit where it is due, you "
 "might feel that some secondary contributors also deserve credit in the "
@@ -1760,7 +1774,7 @@
 "keni përshtypjen se Perl thjesht thërret për përmendje, dhe doni të 
shkruani "
 "GNU/Linux/Perl, jepini."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Since a long name such as GNU/X11/Apache/Linux/TeX/Perl/Python/FreeCiv "
 "becomes absurd, at some point you will have to set a threshold and omit the "
@@ -1774,7 +1788,7 @@
 "vend të saktë të vetëkuptueshëm për vendosjen e pragut, ndaj kudo që 
ta "
 "vendosni, nuk kemi për ta kundërshtuar."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Different threshold levels would lead to different choices of name for the "
 "system.  But one name that cannot result from concerns of fairness and "
@@ -1789,7 +1803,7 @@
 "kontributeve dytësorë (Linux), ndërkohë që lihet jashtë kontributi 
parësor "
 "(GNU)."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "systemd plays an important role in the GNU/Linux system as it is today; are "
 "we obligated to call it GNU/systemd/Linux? <span class=\"anchor-reference-id"
@@ -1799,7 +1813,7 @@
 "është ky sot, a e kemi për detyrë ta quajmë GNU/systemd/Linux? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#others\">#others</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "systemd is a fairly important component, but not as important as the kernel "
 "(Linux), nor as important as the basis of the system as a whole (GNU).  "
@@ -1812,7 +1826,7 @@
 "e systemd-së, duke e quajtur sistemi &ldquo;GNU/systemd/Linux&rdquo;, s’ka 
"
 "asgjë të keqe të bëhet kështu."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today, but they don't "
 "insist on calling it XYZ/Linux.  Why should we treat GNU specially? <span "
@@ -1822,7 +1836,7 @@
 "ata nuk ngulin këmbë të quhet XYZ/Linux.  Pse duhet trajtuar veçan 
GNU-ja? "
 "<span class=\"anchor-reference-id\">(<a href=\"#others\">#others</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Thousands of projects have developed programs commonly included in today's "
 "GNU/Linux systems.  They all deserve credit for their contributions, but "
@@ -1834,7 +1848,7 @@
 "nuk janë zhvillues kryesorë të sistemit si i tërë, ndaj nuk kërkojnë 
të "
 "përmenden si të tillë."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is different because it is more than just a contributed program, more "
 "than just a collection of contributed programs.  GNU is the framework on "
@@ -1844,7 +1858,7 @@
 "kontribuar nga dikush, më tepër se sa një koleksion programesh të 
kontribuar "
 "nga disa.  GNU është kuadri i punës në të cilin sistemi u ndërtua."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "GNU is a small fraction of the system nowadays, so why should we mention it? "
 "<span class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</"
@@ -1854,7 +1868,7 @@
 "përmendim? <span class=\"anchor-reference-id\">(<a href=\"#allsmall"
 "\">#allsmall</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In 2008, we found that GNU packages made up 15% of the &ldquo;main&rdquo; "
 "repository of the gNewSense GNU/Linux distribution.  Linux made up 1.5%.  So "
@@ -1865,7 +1879,7 @@
 "shpërndarjes GNU/Linux gNewSense.  Linux-i përbënte 1.5%.  Ndaj i njëjti "
 "argument do të duhej zbatuar edhe më me forcë në rastin e emërtimit 
“Linux”."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is a small fraction of the system nowadays, and Linux is an even smaller "
 "fraction.  But they are the system's core; the system was made by combining "
@@ -1875,7 +1889,7 @@
 "më e vogël.  Por janë thelbi i sistemit; sistemi doli nga ndërthurja e "
 "tyre.   Ndaj, emri “GNU/Linux” mbetet i përshtatshëm."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many companies contributed to the system as it is today; doesn't that mean "
 "we ought to call it GNU/Red&nbsp;Hat/Novell/Linux? <span class=\"anchor-"
@@ -1886,7 +1900,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#manycompanies"
 "\">#manycompanies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is not comparable to Red Hat or Novell; it is not a company, or an "
 "organization, or even an activity.  GNU is an operating system.  (When we "
@@ -1900,7 +1914,7 @@
 "zhvillimit të sistemit GNU.)  Sistemi GNU/Linux bazohet në GNU, e prandaj 
do "
 "të duhej që GNU të dukej te emri i tij."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Much of those companies' contribution to the GNU/Linux system lies in the "
 "code they have contributed to various GNU packages including GCC and GNOME.  "
@@ -1912,7 +1926,7 @@
 "n.  Të thuash GNU/Linux u jep hakën këtyre shoqërive bashkë me gjithë 
pjesën "
 "tjetër të zhvilluesve të GNU-së."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
@@ -1921,7 +1935,7 @@
 "Pse e shkruani “GNU/Linux” në vend se “GNU Linux”? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean "
@@ -1933,7 +1947,7 @@
 "“Linux-i, që është një paketë GNU”. Asnjë prej këtyre kuptimeve 
nuk i shkon "
 "gjendjes që kemi."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is not a GNU package; that is, it wasn't developed under the GNU "
 "Project's aegis or contributed specifically to the GNU Project.  Linus "
@@ -1945,14 +1959,24 @@
 "e shkrojti Linux-in në mënyrë të pavarur, si projekt të vetin.  Ndaj 
“Linux-"
 "i, që është një paketë GNU” nuk qëndron."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "We're not talking about a distinct GNU version of Linux, the kernel.  The "
+#| "free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/";
+#| "project/linux\">separate version of Linux</a>, since the &ldquo;"
+#| "standard&rdquo; version contains non-free firmware &ldquo;blobs&rdquo;.  "
+#| "If this were part of the GNU Project, it could be considered &ldquo;GNU "
+#| "Linux&rdquo;; but we would not want to call it that, because it would be "
+#| "too confusing."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
-"free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/project/";
-"linux\">separate version of Linux</a>, since the &ldquo;standard&rdquo; "
-"version contains non-free firmware &ldquo;blobs&rdquo;.  If this were part "
-"of the GNU Project, it could be considered &ldquo;GNU Linux&rdquo;; but we "
-"would not want to call it that, because it would be too confusing."
+"free GNU/Linux distros do have a <a href=\"https://directory.fsf.org/wiki/";
+"Linux-libre\">separate version of Linux</a>, since the &ldquo;"
+"standard&rdquo; version contains nonfree firmware &ldquo;blobs&rdquo;.  If "
+"this were part of the GNU Project, it could be considered &ldquo;GNU "
+"Linux&rdquo;; but we would not want to call it that, because it would be too "
+"confusing."
 msgstr ""
 "Nuk po flasim për një version GNU të dallueshëm të Linux-it, kernelit.  "
 "Shpërndarjet e lira GNU/Linux kanë <a href=\"http://directory.fsf.org/";
@@ -1961,7 +1985,7 @@
 "Projektit GNU, mund të shihej mundësia e “GNU Linux”; por nuk do të 
donim ta "
 "quanim kështu, ngaqë do të ishte shumë ngatërruese."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We're talking about a version of GNU, the operating system, distinguished by "
 "having Linux as the kernel.  A slash fits the situation because it means "
@@ -1973,7 +1997,7 @@
 "“ndërthurje”. (Kujtoni rastin “Input/Output”.)  Ky sistem është 
ndërthurje e "
 "GNU-së dhe Linux-it; prej këndej rrjedh edhe “GNU/Linux”."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are other ways to express &ldquo;combination&rdquo;.  If you think "
 "that a plus-sign is clearer, please use that.  In French, a hyphen is clear: "
@@ -1984,7 +2008,7 @@
 "plus është më e qartë, ju lutemi, përdoreni.  Në Frëngjisht, një 
vijë në mes "
 "është e qartë: “GNU-Linux”.  Në Spanjisht, ndonjëherë themi “GNU 
con Linux”."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How is the name &ldquo;GNU/Linux&rdquo; pronounced? <span class=\"anchor-"
 "reference-id\">(<a href=\"#pronounce\">#pronounce</a>)</span>"
@@ -1992,7 +2016,7 @@
 "Si shqiptohet emri &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id"
 "\">(<a href=\"#pronounce\">#pronounce</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please pronounce it as &ldquo;GNU slash Linux.&rdquo; If you don't pronounce "
 "the slash, people will think you are saying &ldquo;GNU Linux,&rdquo; which "
@@ -2003,7 +2027,7 @@
 "&rdquo;, çka <a href=\"#whyslash\">s’është emër i përshtatshëm për "
 "kombinimin</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU Emacs&rdquo; rather than &ldquo;GNU/"
 "Emacs&rdquo;? <span class=\"anchor-reference-id\">(<a href=\"#whynoslash"
@@ -2013,7 +2037,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#whynoslash\">#whynoslash</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Emacs&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Emacs&rdquo;.  That is the right "
@@ -2023,7 +2047,7 @@
 "modifikon “Emacs”.  Kjo është rruga e drejtë për të përshkruar një 
program "
 "të quajtur Emacs i cili është një paketë GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;GNU/Emacs&rdquo; would mean the combination of GNU, the operating "
 "system, and the program Emacs.  That doesn't fit this program, so &ldquo;GNU/"
@@ -2033,7 +2057,7 @@
 "operativ, dhe programit Emacs.  Kjo nuk mund të thuhet për këtë program, "
 "ndaj &ldquo;GNU/Emacs&rdquo; është rruga e gabuar për t’iu referuar 
atij."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why &ldquo;GNU/Linux&rdquo; rather than &ldquo;Linux/GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
@@ -2041,7 +2065,7 @@
 "Pse “GNU/Linux” dhe jo “Linux/GNU”? <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#whyorder\">#whyorder</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is right and proper to mention the principal contribution first.  The GNU "
 "contribution to the system is not only bigger than Linux and prior to Linux, "
@@ -2051,7 +2075,7 @@
 "Kontributi GNU në sistem jo vetëm është më i madh se sa Linux-i dhe para 
"
 "Linux-it, në fakt ne nisëm krejt veprimtarinë."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the lowest "
 "level of the system and GNU fills technically higher levels."
@@ -2059,7 +2083,7 @@
 "Veç kësaj, “GNU/Linux”-i pajtohet me faktin që Linux-i është niveli 
më i "
 "ulët i sistemit dhe që GNU-ja plotëson nivele teknikisht më të lartë."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
 "lot better than what people usually do, which is to omit GNU entirely and "
@@ -2069,7 +2093,7 @@
 "më mirë se sa ajo që bëjnë njerëzit zakonisht, çka është lënia 
krejtësisht "
 "jashtë e GNU-së dhe që e bën të duket sikur krejt sistemi është Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
 "say anything about what the system consists of.  Why shouldn't they call it "
@@ -2080,7 +2104,7 @@
 "përbëhet sistemi.  Pse të mos e quanin si t’u pëlqente? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#distronames0\">#distronames0</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling a system &ldquo;Foobar Linux&rdquo; implies that it's a flavor of "
 "&ldquo;Linux,&rdquo; and people <a href=\"#distronames\">understand it that "
@@ -2089,7 +2113,7 @@
 "Quajtja e një sistemi “Aksh Linux” nënkupton se është një lloj 
“Linux”-i dhe "
 "njerëzit <a href=\"#distronames\">kështu e kuptojnë</a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If they called a GNU/Linux distro &ldquo;Foobar BSD,&rdquo; you would call "
 "that a mistake.  &ldquo;This system is not BSD,&rdquo; you would tell them.  "
@@ -2098,7 +2122,7 @@
 "Nëse një shpërndarje GNU/Linux do ta quanin “Aksh BSD”, ju do ta 
merrnit për "
 "gabim.  Do t’u thonit, “Ky sistem s’është BSD”.  Dhe as Linux nuk 
është."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro is called &ldquo;Foobar Linux&rdquo;; doesn't that show it's "
 "really Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
@@ -2108,7 +2132,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#distronames\">#distronames</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It means that the people who make the &ldquo;Foobar Linux&rdquo; distro are "
 "repeating the common mistake. We appreciate that distributions like Debian, "
@@ -2122,7 +2146,7 @@
 "tyre zyrtar, dhe shpresojmë që nëse merreni me një tjetër shpërndarje, 
t’i "
 "nxisni të bëjnë të njëjtën gjë."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's official name is &ldquo;Foobar Linux&rdquo;; isn't it wrong to "
 "call the distro anything but &ldquo;Foobar Linux&rdquo;? <span class="
@@ -2132,7 +2156,7 @@
 "thirret shpërndarja ndryshe nga “Aksh Linux”? <span 
class=\"anchor-reference-"
 "id\">(<a href=\"#distronames1\">#distronames1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When they spread misinformation by changing &ldquo;GNU&rdquo; to &ldquo;"
 "Linux&rdquo;, and call their version of it &ldquo;Foobar Linux&rdquo;, it's "
@@ -2143,7 +2167,7 @@
 "quajnë versionin e tyre “Aksh Linux”, është e drejtë që ta ndreqni "
 "informacionin e gabuar duke e quajtur “Aksh GNU/Linux”."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be more effective to ask companies such as Mandrake, Red Hat and "
 "IBM to call their distributions &ldquo;GNU/Linux&rdquo; rather than asking "
@@ -2155,7 +2179,7 @@
 "individëve? <span class=\"anchor-reference-id\">(<a href=\"#companies"
 "\">#companies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It isn't a choice of one or the other&mdash;we ask companies and "
 "organizations and individuals to help spread the word about this.  In fact, "
@@ -2173,7 +2197,7 @@
 "komercial; presim të fitojmë më tepër para nga emërtimi “Linux””. 
Me fjalë "
 "të tjera, asaj shoqërie nuk iu bë vonë se çfarë qe e drejtë."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We can't make them do this right, but we're not the sort to give up just "
 "because the road isn't easy.  You may not have as much influence at your "
@@ -2187,7 +2211,7 @@
 "ndryshojmë gjendjen deri në atë shkallë, sa shoqëritë të fitojnë më 
shumë "
 "para duke e quajtur “GNU/Linux”."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to reserve the name &ldquo;GNU/Linux&rdquo; for "
 "distributions that are purely free software? After all, that is the ideal of "
@@ -2198,15 +2222,26 @@
 "puro <em>software</em> i lirë? Tek e fundit, ky është ideali i GNU-së. 
<span "
 "class=\"anchor-reference-id\">(<a href=\"#reserve\">#reserve</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+#, fuzzy
+#| msgid ""
+#| "The widespread practice of adding non-free software to the GNU/Linux "
+#| "system is a major problem for our community.  It teaches the users that "
+#| "non-free software is ok, and that using it is part of the spirit of "
+#| "&ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part "
+#| "of their mission to help users use non-free add-ons, and may even invite "
+#| "salesmen to come and make sales pitches for them.  They adopt goals such "
+#| "as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them "
+#| "use non-free applications and drivers), or making the system more popular "
+#| "even at the cost of freedom."
 msgid ""
-"The widespread practice of adding non-free software to the GNU/Linux system "
-"is a major problem for our community.  It teaches the users that non-free "
+"The widespread practice of adding nonfree software to the GNU/Linux system "
+"is a major problem for our community.  It teaches the users that nonfree "
 "software is ok, and that using it is part of the spirit of &ldquo;"
 "Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of their "
-"mission to help users use non-free add-ons, and may even invite salesmen to "
+"mission to help users use nonfree add-ons, and may even invite salesmen to "
 "come and make sales pitches for them.  They adopt goals such as &ldquo;"
-"helping the users&rdquo; of GNU/Linux (including helping them use non-free "
+"helping the users&rdquo; of GNU/Linux (including helping them use nonfree "
 "applications and drivers), or making the system more popular even at the "
 "cost of freedom."
 msgstr ""
@@ -2220,11 +2255,11 @@
 "(përfshi ndihmën për ta që të përdorin aplikacione dhe përudhës jo 
të lirë), "
 "ose popullarizimin edhe më të sistemit, qoftë edhe në kurriz të lirisë."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The question is how to try to change this."
 msgstr "Çështja është si të ndryshohet kjo."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Given that most of the community which uses GNU with Linux already does not "
 "realize that's what it is, for us to disown these adulterated versions, "
@@ -2239,13 +2274,22 @@
 "Vetëm se do të përgjigjeshin se nuk e kishin menduar kurrë që këto 
sisteme "
 "qenë GNU së pari."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The way to lead these users to see a connection with freedom is exactly "
+#| "the opposite: to inform them that all these system versions <em>are</em> "
+#| "versions of GNU, that they all are based on a system that exists "
+#| "specifically for the sake of the users' freedom.  With this "
+#| "understanding, they can start to recognize the distributions that include "
+#| "non-free software as perverted, adulterated versions of GNU, instead of "
+#| "thinking they are proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgid ""
 "The way to lead these users to see a connection with freedom is exactly the "
 "opposite: to inform them that all these system versions <em>are</em> "
 "versions of GNU, that they all are based on a system that exists "
 "specifically for the sake of the users' freedom.  With this understanding, "
-"they can start to recognize the distributions that include non-free software "
+"they can start to recognize the distributions that include nonfree software "
 "as perverted, adulterated versions of GNU, instead of thinking they are "
 "proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgstr ""
@@ -2257,7 +2301,7 @@
 "em> jo të lirë si versione të deformuara, të ndotura, të GNU-së, në 
vend se "
 "t’i mendojnë si versione të pastra dhe të përshtatshme të “Linux”."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is very useful to start GNU/Linux User Groups, which call the system GNU/"
 "Linux and adopt the ideals of the GNU Project as a basis for their "
@@ -2275,7 +2319,7 @@
 "të ri.  Njerëzit që përqendrohen në qëllime më sipërfaqësore kanë 
të drejtën "
 "e tyre të kenë pikëpamje të tyret, por mos i lejoni t’ju marrin me 
vete!"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not make a GNU distribution of Linux (sic) and call that GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
@@ -2285,7 +2329,7 @@
 "Linux? <span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "All the &ldquo;Linux&rdquo; distributions are actually versions of the GNU "
 "system with Linux as the kernel.  The purpose of the term &ldquo;GNU/"
@@ -2298,7 +2342,7 @@
 "pikë.  Të zhvillosh një shpërndarje të re dhe ta quash veçmas 
“GNU/Linux” do "
 "të errësonte pikën që ne duam të theksojmë."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "As for developing a distribution of GNU/Linux, we already did this once, "
 "when we funded the early development of Debian GNU/Linux.  To do it again "
@@ -2312,7 +2356,7 @@
 "do të kishte përparësi praktike domethënëse ndaj shpërndarjeve të 
tjera, nuk "
 "do t’i shërbente ndonjë qëllimi."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Instead we help the developers of 100% free GNU/Linux distributions, such as "
 "gNewSense and Ututo."
@@ -2320,7 +2364,7 @@
 "Në vend të kësaj, ne ndihmojmë zhvilluesit e shpërndarjeve GNU/Linux 
100% të "
 "lira, të tilla si gNewSense dhe Ututo."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not just say &ldquo;Linux is the GNU kernel&rdquo; and release some "
 "existing version of GNU/Linux under the name &ldquo;GNU&rdquo;? <span class="
@@ -2330,7 +2374,7 @@
 "qarkullim ndonjë version ekzistues i GNU/Linux-it nën emrin “GNU”? 
<span "
 "class=\"anchor-reference-id\">(<a href=\"#linuxgnu\">#linuxgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It might have been a good idea to adopt Linux as the GNU kernel back in "
 "1992.  If we had realized, then, how long it would take to get the GNU Hurd "
@@ -2340,7 +2384,7 @@
 "më 1992.  Sikur ta dinim, atëherë, se sa gjatë do të donte GNU Hurd-i 
të "
 "funksiononte, mund ta kishim bërë.  (Por kësaj i thonë: mend pas 
kuvendi.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we were to take an existing version of GNU/Linux and relabel it as &ldquo;"
 "GNU&rdquo;, that would be somewhat like making a version of the GNU system "
@@ -2351,7 +2395,7 @@
 "“GNU”, do të qe si të merrnim një version të sistemit GNU dhe ta 
etiketonim "
 "“Linux”.  Kjo nuk ishte e drejtë, dhe nuk duam të veprojmë kështu."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Did the GNU Project condemn and oppose use of Linux in the early days? <span "
 "class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
@@ -2360,7 +2404,7 @@
 "fillimet e tij? <span class=\"anchor-reference-id\">(<a href=\"#condemn"
 "\">#condemn</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We did not adopt Linux as our kernel, but we didn't condemn or oppose it.  "
 "In 1993 we started discussing the arrangements to sponsor the development of "
@@ -2379,7 +2423,7 @@
 "ndryshimet qenë <em>ad-hoc</em> dhe të pakalueshme gjetiu; për instalim "
 "kishin nevojë të pastroheshin."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who had made the changes showed little interest in cooperating "
 "with us.  One of them actually told us that he didn't care about working "
@@ -2398,7 +2442,7 @@
 "qenë grupi i parë (dhe, ende, praktikisht të vetmit) që s’dëshironin 
të "
 "punonin me ne."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It was this experience that first showed us that people were calling a "
 "version of the GNU system &ldquo;Linux&rdquo;, and that this confusion was "
@@ -2412,7 +2456,7 @@
 "jonë për këtë problem, dhe për probleme të tjera të shkaktuara nga 
emërtimi "
 "i shtrembër “Linux”."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why did you wait so long before asking people to use the name GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
@@ -2421,7 +2465,7 @@
 "Linux? <span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually we didn't.  We began talking privately with developers and "
 "distributors about this in 1994, and made a more public campaign in 1996.  "
@@ -2431,7 +2475,7 @@
 "zhvilluesit dhe shpërndarësit diku aty nga 1994, dhe kaluam në fushatë "
 "publike më 1996.  Do të vazhdojmë për aq kohë sa të jetë e nevojshme."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should the GNU/<i>name</i> convention be applied to all programs that are "
 "GPL'ed? <span class=\"anchor-reference-id\">(<a href=\"#allgpled"
@@ -2441,7 +2485,7 @@
 "programet që janë nën GPL? <span class=\"anchor-reference-id\">(<a href="
 "\"#allgpled\">#allgpled</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We never refer to individual programs as &ldquo;GNU/<i>name</i>&rdquo;.  "
 "When a program is a GNU package, we may call it &ldquo;GNU <i>name</"
@@ -2450,7 +2494,7 @@
 "Kurrë nuk u referohemi programeve individualë si “GNU/<i>emër</i>”.  
Kur një "
 "program është paketë GNU, mund ta quajmë “<i>emër</i> GNU”."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU, the operating system, is made up of many different programs.  Some of "
 "the programs in GNU were written as part of the GNU Project or specifically "
@@ -2461,7 +2505,7 @@
 "programet në GNU qenë shkruar si pjesë e Projektit GNU ose dhënë 
veçanërisht "
 "për të; këto janë paketat GNU, dhe ne shpesh përdorim “GNU” në 
emrat e tyre."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It's up to the developers of a program to decide if they want to contribute "
 "it and make it a GNU package.  If you have developed a program and you would "
@@ -2475,7 +2519,7 @@
 "\"mailto:gnu@gnu.org\";>&lt;gnu@gnu.org&gt;</a>, që të mund ta vlerësojmë 
dhe "
 "të vendosim nëse e duam."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It wouldn't be fair to put the name GNU on every individual program that is "
 "released under the GPL.  If you write a program and release it under the "
@@ -2495,7 +2539,7 @@
 "është paketë GNU, Projekti GNU nuk mund të marrë dafinat për të, dhe "
 "vendosja e “GNU”-së te emri i saj do të ishte e pasaktë."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In contrast, we do deserve the overall credit for the GNU operating system "
 "as a whole, even though not for each and every program in it.  The system "
@@ -2507,7 +2551,7 @@
 "sistem falë vendosmërisë dhe këmbënguljes sonë, që prej 1984-s, shumë 
vite "
 "para se të fillonte Linux-i."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The operating system in which Linux became popular was basically the same as "
 "the GNU operating system.  It was not entirely the same, because it had a "
@@ -2519,7 +2563,7 @@
 "kernel, por në pjesën më të madhe qe i njëjti sistem.  Qe një variant i 
GNU-"
 "së.  Qe sistemi GNU/Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux continues to be used primarily in derivatives of that system&mdash;in "
 "today's versions of the GNU/Linux system.  What gives these systems their "
@@ -2531,7 +2575,7 @@
 "identitetin e tyre është GNU-ja dhe Linux-i në qendër të tyre, jo "
 "përjashtimisht Linux-i."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since much of GNU comes from Unix, shouldn't GNU give credit to Unix by "
 "using &ldquo;Unix&rdquo; in its name? <span class=\"anchor-reference-id\">"
@@ -2541,7 +2585,7 @@
 "hakun Unix-it duke përdorur “Unix” te emri i vet? <span class=\"anchor-"
 "reference-id\">(<a href=\"#unix\">#unix</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Actually, none of GNU comes from Unix.  Unix was proprietary software (and "
 "still is), so using any of its code in GNU would have been illegal.  This is "
@@ -2558,7 +2602,7 @@
 "lirë për ta zëvendësuar atë.  Nuk mund të kopjonim programe, ose madje 
as "
 "pjesë të tyre, nga Unix-i; gjithçka duhej shkruar nga e para."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "No code in GNU comes from Unix, but GNU is a Unix-compatible system; "
 "therefore, many of the ideas and specifications of GNU do come from Unix.  "
@@ -2572,13 +2616,22 @@
 "mënyrë gaztore për t’i dhënë hakën Unix-it për të, në vijim të 
një tradite "
 "hacker-ësh për shkurtime ripërsëritëse që zuri fill në vitet ’70."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The first such recursive acronym was TINT, &ldquo;TINT Is Not "
+#| "TECO&rdquo;.  The author of TINT wrote another implementation of TECO "
+#| "(there were already many of them, for various systems), but instead of "
+#| "calling it by a dull name like &ldquo;<em>somethingorother</em> "
+#| "TECO&rdquo;, he thought of a clever amusing name.  (That's what hacking "
+#| "means: <a href=\"http://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
 "The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
 "The author of TINT wrote another implementation of TECO (there were already "
 "many of them, for various systems), but instead of calling it by a dull name "
 "like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of a clever "
-"amusing name.  (That's what hacking means: <a href=\"http://stallman.org/";
+"amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
 "Shkurtimi i parë ripërsëritës qe TINT, “TINT Is Not TECO”.  Autori i 
TINT-it "
@@ -2588,7 +2641,7 @@
 "kuptimi për <em>hacking</em>: <a href=\"http://stallman.org/articles/on-";
 "hacking.html\">mençuri lojcake</a>.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Other hackers enjoyed that name so much that we imitated the approach.  It "
 "became a tradition that, when you were writing from scratch a program that "
@@ -2604,7 +2657,7 @@
 "Not Klever”. Në po të njëjtën frymë e quajtëm zëvendësimin tonë 
për Unix-in "
 "“GNU’s Not Unix”."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Historically, AT&amp;T which developed Unix did not want anyone to give it "
 "credit by using &ldquo;Unix&rdquo; in the name of a similar system, not even "
@@ -2620,7 +2673,7 @@
 "është arsyeja pse versionet e ndryshme të modifikuara të Unix-it (të 
tërë "
 "pronësorë, si Unix) patën emra krejt të ndryshëm që s’e përfshinin 
“Unix”-in."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we say &ldquo;GNU/BSD&rdquo; too? <span class=\"anchor-reference-id\">"
 "(<a href=\"#bsd\">#bsd</a>)</span>"
@@ -2628,7 +2681,7 @@
 "Mos do të duhej të thoshim njësoj “GNU/BSD”? <span 
class=\"anchor-reference-"
 "id\">(<a href=\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems, "
 "because that term does not fit the history of the BSD systems."
@@ -2636,9 +2689,15 @@
 "Nuk i quajmë sistemet BSD (FreeBSD, etj.) sisteme “GNU/BSD”, ngaqë ai 
term "
 "nuk gjen vend te historia e sistemeve BSD."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The BSD system was developed by UC Berkeley as non-free software in the "
+#| "80s, and became free in the early 90s.  A free operating system that "
+#| "exists today is almost certainly either a variant of the GNU system, or a "
+#| "kind of BSD system."
 msgid ""
-"The BSD system was developed by UC Berkeley as non-free software in the 80s, "
+"The BSD system was developed by UC Berkeley as nonfree software in the 80s, "
 "and became free in the early 90s.  A free operating system that exists today "
 "is almost certainly either a variant of the GNU system, or a kind of BSD "
 "system."
@@ -2648,7 +2707,7 @@
 "operativ që ekziston sot është, thuajse me siguri, ose variant i sistemit "
 "GNU, ose ndonjë lloj sistemi BSD."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "People sometimes ask whether BSD too is a variant of GNU, as GNU/Linux is.  "
 "It is not.  The BSD developers were inspired to make their code free "
@@ -2662,7 +2721,7 @@
 "thirrje shprehimisht prej aktivistësh të GNU-së i ndihmuan t’ia nisin 
punës, "
 "por kodi ka pak puqje me GNU-në."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "BSD systems today use some GNU packages, just as the GNU system and its "
 "variants use some BSD programs; however, taken as wholes, they are two "
@@ -2676,7 +2735,7 @@
 "shkruan ndonjë kernel për t’ia shtuar sistemit GNU, ndaj një emër i 
tillë si "
 "GNU/BSD nuk do t’i shkonte gjërave."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The connection between GNU/Linux and GNU is much closer, and that's why the "
 "name &ldquo;GNU/Linux&rdquo; is appropriate for it."
@@ -2684,7 +2743,7 @@
 "Lidhja mes GNU/Linux-it dhe GNU-së është shumë e ngushtë, dhe për 
këtë shkak "
 "emri “GNU/Linux” është i përshtatshëm për të."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is a version of GNU which uses the kernel from NetBSD.  Its developers "
 "call it &ldquo;Debian GNU/NetBSD&rdquo;, but &ldquo;GNU/"
@@ -2698,7 +2757,7 @@
 "është një sistem BSD, ngaqë pjesa dërrmuese e sistemit është e 
njëjtë me "
 "sistemin GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "If I install the GNU tools on Windows, does that mean I am running a GNU/"
 "Windows system? <span class=\"anchor-reference-id\">(<a href=\"#othersys"
@@ -2708,7 +2767,7 @@
 "sistem GNU/Windows? <span class=\"anchor-reference-id\">(<a href=\"#othersys"
 "\">#othersys</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
 "GNU are just a part of the GNU software, which is just a part of the GNU "
@@ -2722,7 +2781,7 @@
 "plotë, i cili nuk do të kishte të përbashkët me GNU-në as edhe një 
rresht "
 "kod.  Përmbledhtas, kjo është gjendje krejt tjetër nga GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can't Linux be used without GNU? <span class=\"anchor-reference-id\">(<a "
 "href=\"#justlinux\">#justlinux</a>)</span>"
@@ -2730,7 +2789,7 @@
 "A s’mund të përdoret Linux-i pa GNU-në? <span 
class=\"anchor-reference-id\">"
 "(<a href=\"#justlinux\">#justlinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is used by itself, or with small other programs, in some appliances.  "
 "These small software systems are a far cry from the GNU/Linux system.  Users "
@@ -2745,7 +2804,7 @@
 "pajisje xhirojnë thjesht Linux, për të treguar se sa të ndryshme janë 
këto "
 "platforma të vogla nga GNU/Linux-i."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How much of the GNU system is needed for the system to be GNU/Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
@@ -2753,14 +2812,14 @@
 "Sa përqind sistem GNU lypset që një sistem të jetë GNU/Linux? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "&ldquo;How much&rdquo; is not a meaningful question because the GNU system "
 "does not have precise boundaries."
 msgstr ""
 "“Sa” është një pyetje pa kuptim, ngaqë sistemi GNU s’ka kufij të 
përpiktë."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is an operating system maintained by a community.  It includes far more "
 "than just the GNU software packages (of which we have a specific list), and "
@@ -2776,7 +2835,7 @@
 "GNU/Linux.  Nëse përdorni një pjesë të sistemit GNU, duke lënë 
mënjanë "
 "pjesën tjetër, nuk ka ndonjë mënyrë me mend për të thënë se “sa” 
përdorët."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we look at the level of packages, Linux is one important package in the "
 "GNU/Linux system.  The inclusion of one important GNU package is enough to "
@@ -2786,7 +2845,7 @@
 "rëndësishme e sistemit GNU/Linux.  Përfshirja e një pakete të 
rëndësishme "
 "GNU mjafton për të përligjur kërkesën tonë për përmendje të 
barasvlershme."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Are there complete Linux systems [sic] without GNU? <span class=\"anchor-"
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
@@ -2795,7 +2854,7 @@
 "A ka sisteme të plotë Linux [sic] pa GNU-në? <span 
class=\"anchor-reference-"
 "id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There are complete systems that contain Linux and not GNU; Android is an "
 "example.  But it is a mistake to call them &ldquo;Linux&rdquo; systems, just "
@@ -2805,7 +2864,7 @@
 "shembull.   Por është gabim të thirren këta sisteme “Linux”, njësoj 
siç "
 "është gabim të quhet GNU një sistem “Linux”."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android is very different from the GNU/Linux system&mdash;because the two "
 "have very little code in common.  In fact, the only thing they have in "
@@ -2815,7 +2874,7 @@
 "këta të dy kanë shumë pak kod të përbashkët.  Në fakt, e vetmja gjë 
që kanë "
 "të përbashkët është Linux-i."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
 "necessary to say things like, &ldquo;Android contains Linux, but it isn't "
@@ -2827,7 +2886,7 @@
 "Linux, ngaqë s’ka bibliotekat dhe mjetet e zakonshme Linux [sic] [duke "
 "nënkuptuar sistemin GNU]”."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android contains just as much of Linux as GNU/Linux does.  What it doesn't "
 "have is the GNU system.  Android replaces that with Google software that "
@@ -2839,7 +2898,7 @@
 "ndryshe.  Ajo çka e bën Android-in të ndryshëm nga GNU/Linux-i është 
mungesa "
 "e GNU-së."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Is it correct to say &ldquo;using Linux&rdquo; if it refers to using GNU/"
 "Linux and using Android? <span class=\"anchor-reference-id\">(<a href="
@@ -2851,7 +2910,7 @@
 "\"#usegnulinuxandandroidlinuxsyswithoutgnu"
 "\">#usegnulinuxandandroidlinuxsyswithoutgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Far from it.  That usage is so strained that people will not understand the "
 "intended meaning."
@@ -2859,7 +2918,7 @@
 "Aspak.  Ky përdorim është kaq problematik sa që njerëzit s’do të 
kuptojnë "
 "domethënien e synuar."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public will find it very strange to speak of using Android as &ldquo;"
 "using Linux&rdquo;.  It's like having a conversation, then saying you were "
@@ -2869,7 +2928,7 @@
 "si “përdorim të Linux-it”.  Është si të bisedohet me dikë, dhe 
mandej të "
 "thuhet se biseduat me zorrët apo me sistemin e frymëmarrjes së atij 
personi."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public <em>will</em> understand the idea of &ldquo;using Linux&rdquo; "
 "when it's really GNU/Linux, by way of the usual misunderstanding: thinking "
@@ -2879,7 +2938,7 @@
 "vërtet GNU/Linux, përmes keqkuptimit të rëndomtë: duke e menduar krejt "
 "sitemin si “Linux”."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Use of Android and use of GNU/Linux are totally different, as different as "
 "driving a car and riding a bicycle.  The fact that the first two both "
@@ -2902,7 +2961,7 @@
 "qëruar për të folur rreth përdorimit të GNU/Linux-it dhe Android-it 
është të "
 "thuhet “përdorimi i GNU/Linux-it dhe Android-it”."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not call the system &ldquo;Linux&rdquo; anyway, and strengthen Linus "
 "Torvalds' role as posterboy for our community? <span class=\"anchor-"
@@ -2912,7 +2971,7 @@
 "Linus Torvalds-it si simbol për bashkësinë tonë? <span class=\"anchor-"
 "reference-id\">(<a href=\"#helplinus\">#helplinus</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Linus Torvalds is the &ldquo;posterboy&rdquo; (other people's choice of "
 "word, not ours) for his goals, not ours.  His goal is to make the system "
@@ -2930,12 +2989,22 @@
 "\">lirinë për të bashkëpunuar</a> si një parim etik, e prandaj publiku 
s’e "
 "lidh emrin e “Linux-it” me atë parim."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Linus publicly states his disagreement with the free software movement's "
+#| "ideals.  He developed non-free software in his job for many years (and "
+#| "said so to a large audience at a &ldquo;Linux&rdquo;World show), and "
+#| "publicly invited fellow developers of Linux, the kernel, to use non-free "
+#| "software to work on it with him.  He goes even further, and rebukes "
+#| "people who suggest that engineers and scientists should consider social "
+#| "consequences of our technical work&mdash;rejecting the lessons society "
+#| "learned from the development of the atom bomb."
 msgid ""
 "Linus publicly states his disagreement with the free software movement's "
-"ideals.  He developed non-free software in his job for many years (and said "
+"ideals.  He developed nonfree software in his job for many years (and said "
 "so to a large audience at a &ldquo;Linux&rdquo;World show), and publicly "
-"invited fellow developers of Linux, the kernel, to use non-free software to "
+"invited fellow developers of Linux, the kernel, to use nonfree software to "
 "work on it with him.  He goes even further, and rebukes people who suggest "
 "that engineers and scientists should consider social consequences of our "
 "technical work&mdash;rejecting the lessons society learned from the "
@@ -2951,7 +3020,7 @@
 "duhet të shqyrtojnë pasojat shoqërore të veprës së tyre 
teknike&mdash;duke "
 "hedhur tej kështu mësimet që shoqëria ka marrë nga krijimi i bombës 
atomike."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with writing a free program for the motivations of "
 "learning and having fun; the kernel Linus wrote for those reasons was an "
@@ -2971,7 +3040,7 @@
 "që sistemi operativ në fjalë buron prej idealeve të lirisë, jo prej "
 "pikëpamjeve të tij."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong for us to label Linus Torvalds' work as GNU? <span class="
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
@@ -2980,7 +3049,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong, so we don't do that.  Torvalds' work is Linux, the "
 "kernel; we are careful not to attribute that work to the GNU Project or "
@@ -2992,7 +3061,7 @@
 "ta etiketojmë si “GNU”.  Kur flasim për krejt sistemin, emri 
“GNU/Linux” i "
 "jep atij një pjesë të hakës."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Does Linus Torvalds agree that Linux is just the kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
@@ -3000,10 +3069,17 @@
 "A pajtohet Linus Torvalds që Linux-i është thjesht një kernel? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
+#| "versions/RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are "
+#| "GNU software and are under the GNU copyleft. These tools aren't in the "
+#| "distribution - ask me (or GNU)  for more info&rdquo;</a>."
 msgid ""
 "He recognized this at the beginning.  The earliest Linux release notes said, "
-"<a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"<a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
 "RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are GNU software "
 "and are under the GNU copyleft. These tools aren't in the distribution - ask "
 "me (or GNU)  for more info&rdquo;</a>."
@@ -3015,7 +3091,7 @@
 "janë pjesë e shpërndarjes - pyetmëni mua (ose GNU-në)  për më tepër 
të "
 "dhëna”</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not finish the GNU Hurd kernel, release the GNU system as a whole, and "
 "forget the question of what to call GNU/Linux? <span class=\"anchor-"
@@ -3026,7 +3102,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#finishhurd\">#finishhurd</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We would like credit for the GNU operating system no matter which kernel is "
 "used with it."
@@ -3034,13 +3110,20 @@
 "Do të donim të na jepej haka për sistemin operativ GNU, pavarësisht se me 
"
 "çfarë kerneli është përdorur."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Making the GNU Hurd work well enough to compete with Linux would be a big "
+#| "job, and it's not clearly necessary.  The only thing ethically wrong with "
+#| "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the "
+#| "best fix for that problem is <a href=\"http://fsf.org/campaigns/priority-";
+#| "projects\"> developing free replacement for the blobs</a>."
 msgid ""
 "Making the GNU Hurd work well enough to compete with Linux would be a big "
 "job, and it's not clearly necessary.  The only thing ethically wrong with "
 "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the best "
-"fix for that problem is <a href=\"http://fsf.org/campaigns/priority-projects";
-"\"> developing free replacement for the blobs</a>."
+"fix for that problem is <a href=\"https://www.fsf.org/campaigns/priority-";
+"projects\"> developing free replacement for the blobs</a>."
 msgstr ""
 "Ta bësh GNU Hurd-in të funksionojë paq, sa të konkurrojë me Linux-in do 
të "
 "ishte punë shumë e madhe, dhe nuk është qartazi e domosdoshme.  E vetmja "
@@ -3049,7 +3132,7 @@
 "org/campaigns/priority-projects\"> zhvillimi i zëvendësimeve të lira për "
 "blob-e</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The battle is already lost&mdash;society has made its decision and we can't "
 "change it, so why even think about it? <span class=\"anchor-reference-id\">"
@@ -3059,7 +3142,7 @@
 "ndryshojmë, madje pse duhet çuar mendja atje? <span 
class=\"anchor-reference-"
 "id\">(<a href=\"#lost\">#lost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This isn't a battle, it is a campaign of education.  What to call the system "
 "is not a single decision, to be made at one moment by &ldquo;society&rdquo;: "
@@ -3075,7 +3158,7 @@
 "Linux” ju vetë&mdash;e duke bërë kështu, do të ndihmoni të edukohen 
të "
 "tjerët."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Society has made its decision and we can't change it, so what good does it "
 "do if I say &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id\">(<a "
@@ -3085,7 +3168,7 @@
 "po të them “GNU/Linux”? <span class=\"anchor-reference-id\">(<a href="
 "\"#whatgood\">#whatgood</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is not an all-or-nothing situation: correct and incorrect pictures are "
 "being spread more or less by various people.  If you call the system &ldquo;"
@@ -3105,7 +3188,7 @@
 "bie të keni edukuar një numër domethënës njerëzish përmes shumë pak "
 "përpjekjeje.  Dhe ca prej tyre do ta shpien ndreqjen edhe te të tjerë."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to call the system &ldquo;Linux&rdquo; and teach "
 "people its real origin with a ten-minute explanation? <span class=\"anchor-"
@@ -3115,7 +3198,7 @@
 "origjina e njëmendtë e tij, përmes një shpjegimi dhjetëminutësh? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#explain\">#explain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "If you help us by explaining to others in that way, we appreciate your "
 "effort, but that is not the best method.  It is not as effective as calling "
@@ -3126,7 +3209,7 @@
 "sa emërtimi e sistemit “GNU/Linux”, dhe ua harxhon kohën në mënyrë 
të "
 "paefektshme."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is ineffective because it may not sink in, and surely will not "
 "propagate.  Some of the people who hear your explanation will pay attention, "
@@ -3142,7 +3225,7 @@
 "fjala te sistemi.  Ka gjasa që do ta quajnë “Linux”.  Pa e dashur 
vërtet, do "
 "të ndihmojnë në përhapjen e përfytyrimit të pasaktë."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is inefficient because it takes a lot more time.  Saying and writing "
 "&ldquo;GNU/Linux&rdquo; will take you only a few seconds a day, not minutes, "
@@ -3156,7 +3239,7 @@
 "it dhe GNU/Linux-it kur shkruani dhe flisni është me tërë mend rruga më 
e "
 "lehtë për të ndihmuar Projektin GNU efektivisht."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people laugh at you when you ask them to call the system GNU/Linux.  "
 "Why do you subject yourself to this treatment? <span class=\"anchor-"
@@ -3166,7 +3249,7 @@
 "nënshtroni veten këtij trajtimi? <span class=\"anchor-reference-id\">(<a "
 "href=\"#treatment\">#treatment</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; tends to give people a mistaken "
 "picture of the system's history and reason for existence.  People who laugh "
@@ -3180,7 +3263,7 @@
 "mendojnë se puna jonë u bë nga Linusi, ndaj qeshin kur u kërkojmë të na 
"
 "jepet haka.  Sikur ta dinin të vërtetën, ka gjasa se nuk do të qesheshin."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Why do we take the risk of making a request that sometimes leads people to "
 "ridicule us? Because often it has useful results that help the GNU Project.  "
@@ -3191,7 +3274,7 @@
 "Projektit GNU.  Do të rrezikojmë abuzimin e pamerituar, vetëm synimi ynë 
të "
 "arrihet."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you see such an ironically unfair situation occurring, please don't sit "
 "idly by.  Please teach the laughing people the real history.  When they see "
@@ -3202,7 +3285,7 @@
 "vërtetë.  Kur të shohin pse kërkesa është e përligjur, ata që kanë 
pak mend "
 "do të reshtin së qeshuri."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people condemn you when you ask them to call the system GNU/Linux.  "
 "Don't you lose by alienating them? <span class=\"anchor-reference-id\">(<a "
@@ -3212,7 +3295,7 @@
 "humbni duke i bërë ata të huaj? <span class=\"anchor-reference-id\">(<a 
href="
 "\"#alienate\">#alienate</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not much.  People who don't appreciate our role in developing the system are "
 "unlikely to make substantial efforts to help us.  If they do work that "
@@ -3228,7 +3311,7 @@
 "ne.  Ndërkohë, duke u mësuar të tjerëve t’i japin hakën e punës 
sonë dikujt "
 "tjetër, po minojnë aftësinë tonë të rekrutojmë ndihmë nga të 
tjerët."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It makes no sense to worry about alienating people who are already mostly "
 "uncooperative, and it is self-defeating to be deterred from correcting a "
@@ -3240,7 +3323,7 @@
 "e një problemi të madh nga frika se mos zemërohen njerëzit që e mbajnë 
atë "
 "gjallë.  Prandaj do të vazhdojmë të përpiqemi ta ndreqim keqemërtimin."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Whatever you contributed, is it legitimate to rename the operating system? "
 "<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
@@ -3249,7 +3332,7 @@
 "sistemi operativ? <span class=\"anchor-reference-id\">(<a href=\"#rename"
 "\">#rename</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are not renaming anything; we have been calling this system &ldquo;"
 "GNU&rdquo; ever since we announced it in 1983.  The people who tried to "
@@ -3259,7 +3342,7 @@
 "kur e bëmë të ditur më 1983.  Njerëzit që provuan ta riemërtojnë në 
“Linux”, "
 "nuk duhej të kishin bërë ashtu."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong to force people to call the system &ldquo;GNU/Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
@@ -3267,7 +3350,7 @@
 "A s’është gabim të detyrohen njerëzit ta quajnë sistemin 
“GNU/Linux”? <span "
 "class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong to force them, and we don't try.  We call the system "
 "&ldquo;GNU/Linux&rdquo;, and we ask you to do it too."
@@ -3275,7 +3358,7 @@
 "Do të qe gabim të detyrohen, dhe as provojmë.  Ne e quajmë sistemin 
“GNU/"
 "Linux”, dhe ju kërkojmë të bëni njësoj."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not sue people who call the whole system &ldquo;Linux&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
@@ -3283,7 +3366,7 @@
 "Pse të mos paditen njerëzit që e quajnë krejt sistemin “Linux”? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are no legal grounds to sue them, but since we believe in freedom of "
 "speech, we wouldn't want to do that anyway.  We ask people to call the "
@@ -3293,7 +3376,7 @@
 "fjalës, nuk do të donim ta bënin, sido që të qe.  Ne u kërkojmë 
njerëzve ta "
 "quajnë sistemin “GNU/Linux” ngaqë kjo është gjëja e drejtë që 
duhet bërë."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Shouldn't you put something in the GNU GPL to require people to call the "
 "system &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id\">(<a href="
@@ -3303,13 +3386,23 @@
 "quajnë sistemin “GNU”? <span class=\"anchor-reference-id\">(<a href="
 "\"#require\">#require</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU GPL is to protect the users' freedom from those "
+#| "who would make proprietary versions of free software.  While it is true "
+#| "that those who call the system &ldquo;Linux&rdquo; often do things that "
+#| "limit the users' freedom, such as bundling non-free software with the GNU/"
+#| "Linux system or even developing non-free software for such use, the mere "
+#| "act of calling the system &ldquo;Linux&rdquo; does not, in itself, deny "
+#| "users their freedom.  It seems improper to make the GPL restrict what "
+#| "name people can use for the system."
 msgid ""
 "The purpose of the GNU GPL is to protect the users' freedom from those who "
 "would make proprietary versions of free software.  While it is true that "
 "those who call the system &ldquo;Linux&rdquo; often do things that limit the "
-"users' freedom, such as bundling non-free software with the GNU/Linux system "
-"or even developing non-free software for such use, the mere act of calling "
+"users' freedom, such as bundling nonfree software with the GNU/Linux system "
+"or even developing nonfree software for such use, the mere act of calling "
 "the system &ldquo;Linux&rdquo; does not, in itself, deny users their "
 "freedom.  It seems improper to make the GPL restrict what name people can "
 "use for the system."
@@ -3323,7 +3416,7 @@
 "vetvete, përdoruesve lirinë e tyre.  Duket jo e përshtatshme ta bësh 
GPL-në "
 "të kufizojë se ç’emër mund të përdoret për sistemin."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you objected to the original BSD license's advertising requirement to "
 "give credit to the University of California, isn't it hypocritical to demand "
@@ -3335,7 +3428,7 @@
 "përmendja e projektit GNU? <span class=\"anchor-reference-id\">(<a href="
 "\"#BSDlicense\">#BSDlicense</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would be hypocritical to make the name GNU/Linux a license requirement, "
 "and we don't.  We only <em>ask</em> you to give us the credit we deserve."
@@ -3343,7 +3436,7 @@
 "Do të ishte hipokrizi të bëhej emri GNU/Linux domosdoshmëri licence, dhe 
as "
 "nuk duam.  Ne vetëm <em>kërkojmë</em> që ju të na jepni hakun që 
meritojmë."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please note that there are at least <a href=\"/licenses/bsd.html\"> two "
 "different BSD licenses</a>.  For clarity's sake, please don't use the term "
@@ -3353,7 +3446,7 @@
 "licenca të ndryshme BSD</a>.  Për hir të qartësisë, ju lutemi, mos 
përdorni "
 "termin “licencë BSD” pa specifikuar se për cilën bëhet fjalë."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you failed to put something in the GNU GPL to require people to call "
 "the system &ldquo;GNU&rdquo;, you deserve what happened; why are you "
@@ -3364,7 +3457,7 @@
 "quajnë sistemin “GNU”, mirë t’ju bëhet; pse ankoheni tani? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#deserve\">#deserve</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The question presupposes a rather controversial general ethical premise: "
 "that if people do not force you to treat them fairly, you are entitled to "
@@ -3376,11 +3469,11 @@
 "tagër të përfitoni prej tyre sa të doni.  Me fjalë të tjera, merr të "
 "mirëqenë që forca të jep të drejtë."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope you disagree with that premise just as we do."
 msgstr "Shpresojmë se nuk pajtoheni me këtë parakusht, njësoj si ne."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't you be better off not contradicting what so many people believe? "
 "<span class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)"
@@ -3390,7 +3483,7 @@
 "besojnë? <span class=\"anchor-reference-id\">(<a href=\"#contradict"
 "\">#contradict</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't think we should go along with large numbers of people because they "
 "have been misled.  We hope you too will decide that truth is important."
@@ -3399,7 +3492,7 @@
 "janë ngatërruar.  Shpresojmë që edhe ju do të vendosni që e vërteta 
është e "
 "rëndësishme."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We could never have developed a free operating system without first denying "
 "the belief, held by most people, that proprietary software was legitimate "
@@ -3409,7 +3502,7 @@
 "së pari besëtytninë, të kultivuar nga shumë njerëz, që software-i 
pronësor "
 "është i ligjshëm dhe i pranueshëm."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
 "<span class=\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</"
@@ -3418,12 +3511,12 @@
 "Meqë shumë vetë e quajnë “Linux”, a e bën kjo të saktë? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#somanyright\">#somanyright</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "We don't think that the popularity of an error makes it the truth."
 msgstr ""
 "Nuk besojmë se popullariteti i një gabimi e shndërron atë në një të 
vërtetë."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it better to call the system by the name most users already know? "
 "<span class=\"anchor-reference-id\">(<a href=\"#knownname\">#knownname</a>)</"
@@ -3433,7 +3526,7 @@
 "përdoruesve? <span class=\"anchor-reference-id\">(<a href=\"#knownname"
 "\">#knownname</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo; includes "
 "&ldquo;Linux&rdquo;, they will recognize what you're talking about.  If you "
@@ -3444,7 +3537,7 @@
 "“Linux”, do ta kuptojnë se për çfarë po flisni.  Nëse me raste 
shtoni "
 "“(referuar shpesh si “Linux”)”, do ta kuptojnë."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many people care about what's convenient or who's winning, not about "
 "arguments of right or wrong.  Couldn't you get more of their support by a "
@@ -3456,12 +3549,19 @@
 "përthithni mbështetjen e tyre përmes një rruge tjetër? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#winning\">#winning</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+#, fuzzy
+#| msgid ""
+#| "To care only about what's convenient or who's winning is an amoral "
+#| "approach to life.  Non-free software is an example of that amoral "
+#| "approach and thrives on it.  Thus, in the long run it would be self-"
+#| "defeating for us to adopt that approach.  We will continue talking in "
+#| "terms of right and wrong."
 msgid ""
 "To care only about what's convenient or who's winning is an amoral approach "
-"to life.  Non-free software is an example of that amoral approach and "
-"thrives on it.  Thus, in the long run it would be self-defeating for us to "
-"adopt that approach.  We will continue talking in terms of right and wrong."
+"to life.  Nonfree software is an example of that amoral approach and thrives "
+"on it.  Thus, in the long run it would be self-defeating for us to adopt "
+"that approach.  We will continue talking in terms of right and wrong."
 msgstr ""
 "Të bësh kujdes vetëm për çka të leverdis, ose për kë po fiton, 
është trajtim "
 "i pamoral i jetës.  Software-i jo i lirë është një shembull i këtij 
trajtimi "
@@ -3469,7 +3569,7 @@
 "përulemi këtij trajtimi, parë në perspektivë afatgjatë.  Ne do të 
vazhdojmë "
 "të flasim me termat e të saktës dhe të gabuarës."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope that you are one of those for whom right and wrong do matter."
 msgstr ""
 "Shpresojmë të jeni një prej atyre për të cilët e sakta dhe e gabuara 
kanë "
@@ -3522,12 +3622,15 @@
 "standards/README.translations.html\">README për përkthimet</a>."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation, "
+"Inc."
 msgstr ""
-"Të drejta kopjimi &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 
"
-"2021 Free Software Foundation, Inc."
+"Të drejta kopjimi &copy; 2014, 2015, 2016, 2017 Free Software Foundation, "
+"Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -3548,3 +3651,10 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "U përditësua më:"
+
+#~ msgid ""
+#~ "Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
+#~ "Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Të drejta kopjimi &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, "
+#~ "2020, 2021 Free Software Foundation, Inc."

Index: gnu/po/gnu-linux-faq.sr.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.sr.po,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- gnu/po/gnu-linux-faq.sr.po  31 May 2021 09:06:18 -0000      1.66
+++ gnu/po/gnu-linux-faq.sr.po  30 Aug 2021 13:34:53 -0000      1.67
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2008-07-25 13:26+0200\n"
 "Last-Translator: Strahinya Radich <vilinkamen@mail.ru>\n"
 "Language-Team: Serbian <www-sr-dev@lists.gnu.org>\n"
@@ -24,31 +24,17 @@
 msgid "GNU/Linux FAQ - GNU Project - Free Software Foundation"
 msgstr "ЧПП ГНУ-а са Линуксом — Пројекат ГНУ — 
Задужбина за слободни софтвер"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU/Linux FAQ"
 msgstr ""
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 #, fuzzy
 #| msgid "GNU/Linux FAQ by Richard Stallman"
 msgid "by Richard Stallman"
 msgstr "ЧПП ГНУ-а са Линуксом од Ричарда 
Сталмана"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
-"linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a href=\"/"
-"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Да бисте више сазнали о овом проблему, 
можете прочитати и наше странице о <a "
-"href=\"/gnu/linux-and-gnu.html\">Линуксу и Пројекту 
ГНУ</a>, <a href=\"/gnu/"
-"why-gnu-linux.html\">Зашто ГНУ са Линуксом?</a> и 
страницу о <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">корисницима ГНУ-а који 
никада нису чули "
-"за ГНУ</a>."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When people see that we use and recommend the name GNU/Linux for a system "
 "that many others call just &ldquo;Linux&rdquo;, they ask many questions.  "
@@ -58,6 +44,10 @@
 "Линуксом“ (енг. <em>GNU/Linux</em>) за систем који 
многи називају „Линуксом“ "
 "нам постављају многа питања. Ево најчешћих
 питања и наших одговора на њих."
 
+#. type: Content of: <div><div><h3>
+msgid "Table of Contents"
+msgstr ""
+
 # | <a href=\"#why\">Why do you call [-it-] {+the system we use+} GNU/Linux
 # | and not Linux?</a>
 #. type: Content of: <div><div><ul><li>
@@ -630,9 +620,30 @@
 "победник, а не шта је исправно. Зар не 
бисте задобили више подршке "
 "другачијим приступом?</a>"
 
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our page on <a href=\"/"
+#| "gnu/linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a "
+#| "href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
+"linux-and-gnu.html\">Linux and the GNU System</a>, our page on <a href=\"/"
+"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Да бисте више сазнали о овом проблему, 
можете прочитати и наше странице о <a "
+"href=\"/gnu/linux-and-gnu.html\">Линуксу и Пројекту 
ГНУ</a>, <a href=\"/gnu/"
+"why-gnu-linux.html\">Зашто ГНУ са Линуксом?</a> и 
страницу о <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">корисницима ГНУ-а који 
никада нису чули "
+"за ГНУ</a>."
+
 # | Why do you call [-it-] {+the system we use+} GNU/Linux and not Linux?
 # | <span class=\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 #, fuzzy
 #| msgid ""
 #| "Why do you call it GNU/Linux and not Linux? <span class=\"anchor-"
@@ -644,7 +655,7 @@
 "Зашто га зовете ГНУ са Линуксом а не 
Линукс? <span class=\"anchor-reference-"
 "id\">(<a href=\"#why\">#why</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Most operating system distributions based on Linux as kernel are basically "
 "modified versions of the GNU operating system.  We began developing GNU in "
@@ -662,11 +673,11 @@
 "смо предводили развој. Ми смо изградили 
већину основних делова који чине "
 "највећи појединачни допринос целом 
систему. Наша је била и основна замисао."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "In fairness, we ought to get at least equal mention."
 msgstr "Да је правде, требало би да нас 
подједнако помињу."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and the GNU System</a> and <a "
 "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
@@ -678,7 +689,7 @@
 "\">Корисници ГНУ-а који никада нису чули за 
ГНУ</a>, а за историју "
 "погледајте <a href=\"/gnu/the-gnu-project.html\">Пројекат 
ГНУ</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why is the name important? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
@@ -686,7 +697,7 @@
 "Зашто је назив битан? <span 
class=\"anchor-reference-id\">(<a href=\"#whycare"
 "\">#whycare</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Although the developers of Linux, the kernel, are contributing to the free "
 "software community, many of them do not care about freedom.  People who "
@@ -700,7 +711,7 @@
 "историјату наше заједнице коју они у 
ствари нису одиграли. А онда они "
 "придају прекомерну тежину гледиштима тих 
градитеља."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Calling the system GNU/Linux recognizes the role that our idealism played in "
 "building our community, and <a href=\"/gnu/why-gnu-linux.html\">helps the "
@@ -710,20 +721,20 @@
 "одиграо у изградњи наше заједнице и <a 
href=\"/gnu/why-gnu-linux.html"
 "\">помаже јавности да уочи конкретну 
важност тих идеала</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the real relationship between GNU and Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#what\">#what</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU operating system and the Linux kernel are separate software projects "
 "that do complementary jobs.  Typically they are packaged in a <a href=\"/"
 "distros/distros.html\">GNU/Linux distribution</a>, and used together."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How did it come about that most people call the system &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
@@ -732,7 +743,7 @@
 "Како је дошло до тога да већина људи 
назива систем „Линуксом“? <span class="
 "\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; is a confusion that has spread faster "
 "than the corrective information."
@@ -740,7 +751,7 @@
 "Називање система „Линуксом“ је забуна 
која се проширила брже него њена "
 "исправка."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who combined Linux with the GNU system were not aware that that's "
 "what their activity amounted to.  They focused their attention on the piece "
@@ -757,7 +768,7 @@
 "је пар година да бисмо схватили колики је 
то проблем и да почнемо да тражимо "
 "од људи да исправе ову праксу. Али до тада 
је забуна узела велики замајац."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the people who call the system &ldquo;Linux&rdquo; have never heard "
 "why that's not the right thing.  They saw others using that name and assume "
@@ -775,7 +786,7 @@
 "Линус Торвалдс 1991. Ова лажна слика 
подцртава идеју да би систем требало "
 "називати „Линуксом“."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Many of the questions in this file represent people's attempts to justify "
 "the name they are accustomed to using."
@@ -783,7 +794,7 @@
 "Многа од питања у овој датотеци 
представљају покушаје разних људи да 
пронађу "
 "оправдање за назив на који су се навикли."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we always say &ldquo;GNU/Linux&rdquo; instead of &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
@@ -791,7 +802,7 @@
 "Треба ли увек да говоримо „ГНУ са 
Линуксом“ уместо „Линукс“? <span class="
 "\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not always&mdash;only when you're talking about the whole system.  When "
 "you're referring specifically to the kernel, you should call it &ldquo;"
@@ -801,7 +812,7 @@
 "језгро, требало би да га називате 
„Линуксом“, називом који је изабрао његов "
 "градитељ."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
 "call the whole system by the same name as the kernel.  This causes many "
@@ -815,7 +826,7 @@
 "на језгро или на цео систем. Називањем 
целог система „ГНУ-ом са Линуксом“ а "
 "језгра „Линуксом“ избегавате 
двосмисленост."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Would Linux have achieved the same success if there had been no GNU? <span "
 "class=\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</"
@@ -824,7 +835,7 @@
 "Да ли би Линукс постигао исти успех да ГНУ 
није ни настао? <span class="
 "\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In that alternative world, there would be nothing today like the GNU/Linux "
 "system, and probably no free operating system at all.  No one attempted to "
@@ -838,7 +849,7 @@
 "изузев Пројекта ГНУ и (касније) 
Берклијевог <em>CSRG</em>-а, од кога је "
 "Пројекат ГНУ посебно тражио да почне са 
ослобођењем свог кода."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds was partly influenced by a speech about GNU in Finland in "
 "1990.  It's possible that even without this influence he might have written "
@@ -852,7 +863,7 @@
 "1992., када га је Линус објавио под ГНУ-овом 
ОЈЛ. (Погледајте белешке о "
 "објављивању за верзију 0.12.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Even if Torvalds had released Linux under some other free software license, "
 "a free kernel alone would not have made much difference to the world.  The "
@@ -864,7 +875,7 @@
 "Линукса потиче од уклапања у већу целину, 
у потпун оперативни систем: ГНУ са "
 "Линуксом."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better for the community if you did not divide people with "
 "this request? <span class=\"anchor-reference-id\">(<a href=\"#divide"
@@ -873,7 +884,7 @@
 "Зар не би било боље по заједницу не делити 
људе овим захтевом? <span class="
 "\"anchor-reference-id\">(<a href=\"#divide\">#divide</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
 "people.  We are asking them to give the GNU Project credit for the GNU "
@@ -883,7 +894,7 @@
 "само тражимо од њих да Пројекту ГНУ одају 
признање за оперативни систем ГНУ. "
 "Ми тиме никога не критикујемо или 
изазивамо."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, there are people who do not like our saying this.  Sometimes those "
 "people push us away in response.  On occasion they are so rude that one "
@@ -896,7 +907,7 @@
 "намерно покушавају да нас ућуткају. То нас 
не ућуткује, али тежи ка дељењу "
 "заједнице, па се надамо да их ви можете 
убедити да престану."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, this is only a secondary cause of division in our community.  The "
 "largest division in the community is between people who appreciate free "
@@ -912,7 +923,7 @@
 "слободни софтвер виде само као ефикасан 
модел изградње (покрет за отворени "
 "изворни код)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This disagreement is not just a matter of names&mdash;it is a matter of "
 "differing basic values.  It is essential for the community to see and think "
@@ -928,7 +939,7 @@
 "point.html\">Зашто отворени изворни код 
пропушта смисао слободног софтвера</"
 "a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The disagreement over values partially aligns with the amount of attention "
 "people pay to the GNU Project's role in our community.  People who value "
@@ -952,7 +963,7 @@
 "ми који ценимо слободу све убедимо у 
исправност наших ставова (што неће бити "
 "лако) или нас потпуно поразе (што се, 
надајмо се, неће догодити)."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Doesn't the GNU project support an individual's free speech rights to call "
 "the system by any name that individual chooses? <span class=\"anchor-"
@@ -962,7 +973,7 @@
 "систем по свом избору? <span 
class=\"anchor-reference-id\">(<a href="
 "\"#freespeech\">#freespeech</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Yes, indeed, we believe you have a free speech right to call the operating "
 "system by any name you wish.  We ask that people call it GNU/Linux as a "
@@ -976,7 +987,7 @@
 "вредности слободе коју ГНУ означава, и да 
бисмо друге обавестили да су "
 "управо вредности слободе изнеле систем на 
светлост дана."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since everyone knows the role of GNU in developing the system, doesn't the "
 "&ldquo;GNU/&rdquo; in the name go without saying? <span class=\"anchor-"
@@ -986,7 +997,7 @@
 "имену не подразумева? <span 
class=\"anchor-reference-id\">(<a href="
 "\"#everyoneknows\">#everyoneknows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Experience shows that the system's users, and the computer-using public in "
 "general, often know nothing about the GNU system.  Most articles about the "
@@ -1000,7 +1011,7 @@
 "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">Корисници ГНУ-а 
који никада "
 "нису чули за ГНУ</a> пружа додатна 
објашњења."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who say this are probably geeks thinking of the geeks they know.  "
 "Geeks often do know about GNU, but many have a completely wrong idea of what "
@@ -1012,7 +1023,7 @@
 "погрешно мишљење о томе шта је ГНУ. На 
пример, многи мисле да се ради о "
 "колекцији <a href=\"#tools\">„алата“</a>, или 
пројекту развоја алата."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The wording of this question, which is typical, illustrates another common "
 "misconception.  To speak of &ldquo;GNU's role&rdquo; in developing something "
@@ -1026,7 +1037,7 @@
 "говорити о улози Пројекта ГНУ у овом или 
нечему другом, али не и о ГНУ-овој "
 "улози."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since I know the role of GNU in this system, why does it matter what name I "
 "use? <span class=\"anchor-reference-id\">(<a href="
@@ -1036,7 +1047,7 @@
 "користим? <span class=\"anchor-reference-id\">(<a href="
 "\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your words don't reflect your knowledge, you don't teach others.  Most "
 "people who have heard of the GNU/Linux system think it is &ldquo;"
@@ -1048,7 +1059,7 @@
 "је покренуо Линус Торвалдс, и да је он 
покренут са намером да буде "
 "„отвореног изворног кода“. Ако им ви не 
кажете, ко ће?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't shortening &ldquo;GNU/Linux&rdquo; to &ldquo;Linux&rdquo; just like "
 "shortening &ldquo;Microsoft Windows&rdquo; to &ldquo;Windows&rdquo;? <span "
@@ -1058,7 +1069,7 @@
 "скраћивање назива „Микрософтов Виндовс“ 
на „Виндовс“? <span class=\"anchor-"
 "reference-id\">(<a href=\"#windows\">#windows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It's useful to shorten a frequently-used name, but not if the abbreviation "
 "is misleading."
@@ -1066,7 +1077,7 @@
 "Корисно је скратити често коришћени 
назив, али не уколико скраћеница може да "
 "доведе у забуну."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Almost everyone in developed countries really does know that the &ldquo;"
 "Windows&rdquo; system is made by Microsoft, so shortening &ldquo;Microsoft "
@@ -1080,7 +1091,7 @@
 "Међутим, скраћивање назива „ГНУ са 
Линуксом“ на „Линукс“ пружа погрешну "
 "слику о томе како је систем настао."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The question is itself misleading because GNU and Microsoft are not the same "
 "kind of thing.  Microsoft is a company; GNU is an operating system."
@@ -1088,7 +1099,7 @@
 "Само питање доводи у забуну, јер ГНУ и 
Микрософт нису иста врста ствари. "
 "Микрософт је фирма, а ГНУ је оперативни 
систем."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't GNU a collection of programming tools that were included in Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
@@ -1096,7 +1107,7 @@
 "Није ли ГНУ само скуп програмерских алата 
који се испоручују са Линуксом? "
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "People who think that Linux is an entire operating system, if they hear "
 "about GNU at all, often get a wrong idea of what GNU is.  They may think "
@@ -1113,7 +1124,7 @@
 "је „ГНУ“ назив оперативног система се 
тешко уклапа у идејни склоп у ком је "
 "оперативни систем означен као „Линукс“."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Project was named after the GNU operating system&mdash;it's the "
 "project to develop the GNU system.  (See <a href=\"/gnu/initial-announcement."
@@ -1124,7 +1135,7 @@
 "\">првобитну објаву из 1983. 
&lt;http://www.gnu.org/gnu/initial-announcement.";
 "html&gt;</a>.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We developed programs such as GCC, GNU Emacs, GAS, GLIBC, BASH, etc., "
 "because we needed them for the GNU operating system.  GCC, the GNU Compiler "
@@ -1140,7 +1151,7 @@
 "ГНУ. Ми, скупина људи која ради у Пројекту 
ГНУ, смо развили и Гостскрипт, "
 "ГНУКеш, ГНУ-ов шах и Гном за систем ГНУ."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the difference between an operating system and a kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
@@ -1148,7 +1159,7 @@
 "Каква је разлика између оперативног 
система и језгра? <span class=\"anchor-"
 "reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "An operating system, as we use the term, means a collection of programs that "
 "are sufficient to use the computer to do a wide variety of jobs.  A general "
@@ -1160,7 +1171,7 @@
 "опште намене мора да обавља све оно што је 
потребно широком кругу корисника "
 "да би био потпун."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The kernel is one of the programs in an operating system&mdash;the program "
 "that allocates the machine's resources to the other programs that are "
@@ -1170,7 +1181,7 @@
 "ресурсе машине другим покренутим 
програмима. Језгро такође руководи "
 "покретањем и заустављањем других 
програма."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "To confuse matters, some people use the term &ldquo;operating system&rdquo; "
 "to mean &ldquo;kernel&rdquo;.  Both uses of the term go back many years.  "
@@ -1190,7 +1201,7 @@
 "чак и игре. Пошто смо ми замислили ГНУ као 
униксолики оперативни систем, ми "
 "користимо израз „оперативни систем“ на 
овај последњи начин."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the time when people speak of the &ldquo;Linux operating "
 "system&rdquo; they are using &ldquo;operating system&rdquo; in the same "
@@ -1207,7 +1218,7 @@
 "вас молимо да додате и „језгро“, како би 
се избегла недоумица о томе на који "
 "„део тела“ софтвера мислите."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
@@ -1218,7 +1229,7 @@
 "за цео скуп програма, на пример 
„системска дистрибуција“, и то је у реду. "
 "Онда ћете говорити о системским 
дистрибуцијама ГНУ-а са Линуксом."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The kernel of a system is like the foundation of a house.  How can a house "
 "be almost complete when it doesn't have a foundation? <span class=\"anchor-"
@@ -1227,7 +1238,7 @@
 "Језгро система је као темељ куће. Како 
кућа може бити потпуна без темеља? "
 "<span class=\"anchor-reference-id\">(<a href=\"#house\">#house</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "A kernel is not much like the foundation of a house because building an "
 "operating system is not much like building a house."
@@ -1235,7 +1246,7 @@
 "Језгро није попут темеља куће јер 
изградња оперативног система није попут "
 "изградње куће."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A house is built from lots of little general parts that are cut and put "
 "together in situ.  They have to be put together from the bottom up.  Thus, "
@@ -1252,7 +1263,7 @@
 # | the International Space Station than like a house.  If most of the Space
 # | Station modules were in orbit [-and connected-] but awaiting one [-vital-]
 # | {+other essential+} module, that would be like the GNU system in 1992.
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 #, fuzzy
 #| msgid ""
 #| "By contrast, an operating system consists of loosely-coupled complex "
@@ -1276,30 +1287,30 @@
 "станице била у орбити, повезана, али без 
једног важног модула, то би "
 "подсећало на систем ГНУ из 1992."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't the kernel the brain of the system? <span class=\"anchor-reference-id"
 "\">(<a href=\"#brain\">#brain</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A computer system is not much like a human body, and no part of it plays a "
 "role comparable to that of the brain in a human."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't writing the kernel most of the work in an operating system? <span "
 "class=\"anchor-reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</"
 "span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "No, many components take a lot of work."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 #, fuzzy
 #| msgid ""
 #| "What is the difference between an operating system and a kernel? <span "
@@ -1313,7 +1324,7 @@
 "Каква је разлика између оперативног 
система и језгра? <span class=\"anchor-"
 "reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The people who argue that way for calling the system &ldquo;Linux&rdquo; are "
 "using a double standard.  An operating system requires compilers, editors, "
@@ -1322,34 +1333,34 @@
 "any of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "That standard is too strict, not the right way to judge the contributions of "
 "any contributor."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds made an important contribution to the operating system we "
 "use; the GNU Project started earlier and contributed much more.  The name "
 "&ldquo;GNU/Linux&rdquo; gives credit to each."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How can GNU be an operating system, if I can't get something called &ldquo;"
 "GNU&rdquo; and install it? <span class=\"anchor-reference-id\">(<a href="
 "\"#notinstallable\">#notinstallable</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Many <a href=\"/distros/distros.html\"> packaged and installable versions of "
 "GNU</a> are available.  None of them is called simply &ldquo;GNU&rdquo;, but "
 "GNU is what they basically are."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We expected to release the GNU system packaged for installation, but this "
 "plan was overtaken by events: in 1992 others were already packaging GNU "
@@ -1361,14 +1372,14 @@
 "Hurd kernel&mdash;which wasn't ready yet."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Hurd kernel never became sufficiently ready; we only recommend it to "
 "those interested in working on it.  So we never packaged GNU with the GNU "
 "Hurd kernel.  However, Debian packaged this combination as Debian GNU/Hurd."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are now developing an advanced Scheme-based package manager called Guix "
 "and a complete system distribution based on it called the <a href=\"/"
@@ -1376,14 +1387,14 @@
 "repackaging a substantial part of the GNU system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We never took the last step of packaging GNU under the name &ldquo;"
 "GNU&rdquo;, but that doesn't alter what kind of thing GNU is.  GNU is an "
 "operating system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "We're calling the whole system after the kernel, Linux.  Isn't it normal to "
 "name an operating system after a kernel? <span class=\"anchor-reference-id\">"
@@ -1393,7 +1404,7 @@
 "оперативни систем по језгру? <span 
class=\"anchor-reference-id\">(<a href="
 "\"#afterkernel\">#afterkernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "That practice seems to be very rare&mdash;we can't find any examples other "
 "than the misuse of the name &ldquo;Linux&rdquo;.  Normally an operating "
@@ -1408,7 +1419,7 @@
 "целину. Језгро обично нема посебно име — 
уместо тога, каже се „језгро тога-и-"
 "тога“<sup><a href=\"#TransNote1\">[1]</a></sup>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Because those two constructions are used synonymously, the expression &ldquo;"
 "the Linux kernel&rdquo; can easily be misunderstood as meaning &ldquo;the "
@@ -1422,13 +1433,13 @@
 "од језгра. Можете да избегнете могућност 
овакве забуне говорећи и пишући "
 "„језгро, Линукс“ или „Линукс, језгро“."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can another system have &ldquo;the feel of Linux&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is no such thing as the &ldquo;feel of Linux&rdquo; because Linux has "
 "no user interfaces.  Like any modern kernel, Linux is a base for running "
@@ -1437,7 +1448,7 @@
 "feel&rdquo; comes from them."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  How about "
 "recommending a shorter name? <span class=\"anchor-reference-id\">(<a href="
@@ -1447,7 +1458,7 @@
 "било да предложите неки краћи назив? <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#long\">#long</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "For a while we tried the name &ldquo;LiGNUx&rdquo;, which combines the words "
 "&ldquo;GNU&rdquo; and &ldquo;Linux&rdquo;.  The reaction was very bad.  "
@@ -1457,7 +1468,7 @@
 "„ГНУ“ и „Линукс“. Реакција јавности је 
била веома лоша. Људи радије "
 "прихватају назив „ГНУ са Линуксом“."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
 "call it &ldquo;GNU/Linux&rdquo; <a href=\"#justgnu\"> for the reasons given "
@@ -1466,14 +1477,14 @@
 "Најкраће исправно име система је „ГНУ“, 
али га ми називамо „ГНУ-ом са "
 "Линуксом“, <a href=\"#justgnu\">због доленаведених 
разлога</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How about calling the system &ldquo;GliNUx&rdquo; (instead of &ldquo;GNU/"
 "Linux&rdquo;)? <span class=\"anchor-reference-id\">(<a href="
 "\"#long1\">#long1</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The name &ldquo;GNU&rdquo; does not visibly appear in &ldquo;Glinux,&rdquo; "
 "so most people would not notice it is there.  Even if it is capitalized as "
@@ -1481,41 +1492,41 @@
 "reference to GNU."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be comparable to writing &ldquo;GNU/Linux,&rdquo; but putting "
 "&ldquo;GNU/&rdquo; in print so small that most people could not read it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  Why should "
 "I go to the trouble of saying &ldquo;GNU/&rdquo;? <span class=\"anchor-"
 "reference-id\">(<a href=\"#long2\">#long2</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
 "the system that we developed, can't you take one second to recognize our "
 "work?"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Unfortunately, &ldquo;GNU/Linux&rdquo; is five syllables. People won't use "
 "such a long term. Shouldn't you find a shorter one? <span class=\"anchor-"
 "reference-id\">(<a href=\"#long3\">#long3</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, &ldquo;GNU/Linux&rdquo; is only four syllables.  &ldquo;"
 "Unfortunately&rdquo; is five syllables, yet people show no sign of "
 "reluctance to use that word."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 #, fuzzy
 #| msgid ""
 #| "Should we always say &ldquo;GNU/Linux&rdquo; instead of &ldquo;"
@@ -1529,21 +1540,21 @@
 "Треба ли увек да говоримо „ГНУ са 
Линуксом“ уместо „Линукс“? <span class="
 "\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Omitting &ldquo;Matthew&rdquo; does not misrepresent anything important "
 "about Stallman's nature, origin, ideas or purpose.  Omitting &ldquo;"
 "GNU&rdquo; does misrepresent those things about the GNU/Linux system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is an example of a frequent way of hiding a fallacy: to bury it inside "
 "a misleading analogy.  A better analogy would be, &ldquo;Why shouldn't we "
 "call Stallman &lsquo;Torvalds&rsquo;?&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since Linux is a secondary contribution, would it be false to the facts to "
 "call the system simply &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id"
@@ -1553,7 +1564,7 @@
 "просто „ГНУ-ом“? <span class=\"anchor-reference-id\">(<a 
href=\"#justgnu"
 "\">#justgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would not be false to the facts, but it is not the best thing to do.  "
 "Here are the reasons we call that system version &ldquo;GNU/Linux&rdquo; "
@@ -1562,7 +1573,7 @@
 "Не би се косило са чињеницама, али то није 
најбољи избор. Ево разлога због "
 "којих ми називамо систем верзијом „ГНУ-а 
са Линуксом“ уместо само „ГНУ-а“:"
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It's not exactly GNU&mdash;it has a different kernel (that is, Linux).  "
 "Distinguishing GNU/Linux from GNU is useful."
@@ -1570,7 +1581,7 @@
 "Не ради се тачно о ГНУ-у — језгро је 
другачије (Линукс). Корисно је "
 "разликовати ГНУ са Линуксом од ГНУ-а."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It would be ungentlemanly to ask people to <em>stop</em> giving any credit "
 "to Linus Torvalds.  He did write an important component of the system.  We "
@@ -1589,7 +1600,7 @@
 "политичких гледишта, али се ми у том 
противљењу понашамо часно и отворено, а "
 "не покушавамо да занемаримо његов 
допринос систему."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
 "&ldquo;GNU&rdquo; they may simply not recognize we're talking about the same "
@@ -1600,7 +1611,7 @@
 "схвате да причамо о другом систему. 
Уколико кажемо „ГНУ са Линуксом“, они ће "
 "повезати оно што ми причамо са оним што су 
већ чули."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "I would have to pay a fee if I use &ldquo;Linux&rdquo; in the name of a "
 "product, and that would also apply if I say &ldquo;GNU/Linux&rdquo;.  Is it "
@@ -1614,7 +1625,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There's nothing wrong in calling the system &ldquo;GNU&rdquo;; basically, "
 "that's what it is.  It is nice to give Linus Torvalds a share of the credit "
@@ -1624,7 +1635,7 @@
 "чему се овде говори. Лепо је и Линусу 
Торвалдсу дати део почасти, али нисте "
 "обавезни да плаћате привилегију да то 
радите."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "So if you want to refer to the system simply as &ldquo;GNU&rdquo;, to avoid "
 "paying the fee for calling it &ldquo;Linux&rdquo;, we won't criticize you."
@@ -1632,7 +1643,7 @@
 "Зато вас нећемо критиковати ако желите да 
систем називате само „ГНУ-ом“, "
 "како бисте избегли плаћање за назив 
„Линукс“."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today; it includes "
 "TeX, X11, Apache, Perl, and many more programs.  Don't your arguments imply "
@@ -1646,7 +1657,7 @@
 "који би био толико дугачак да би то било 
смешно.) <span class=\"anchor-"
 "reference-id\">(<a href=\"#many\">#many</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "What we say is that you ought to give the system's principal developer a "
 "share of the credit.  The principal developer is the GNU Project, and the "
@@ -1655,7 +1666,7 @@
 "Оно што ми поручујемо је да главном 
градитељу система треба одати део "
 "признања. Главни градитељ система је 
Пројекат ГНУ, а систем је у основи ГНУ."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you feel even more strongly about giving credit where it is due, you "
 "might feel that some secondary contributors also deserve credit in the "
@@ -1672,7 +1683,7 @@
 "сматрате да Перл просто вапи за помињањем, 
и желите да пишете ГНУ са "
 "Линуксом и Перлом, само напред."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Since a long name such as GNU/X11/Apache/Linux/TeX/Perl/Python/FreeCiv "
 "becomes absurd, at some point you will have to set a threshold and omit the "
@@ -1686,7 +1697,7 @@
 "помагача. Не постоји ниједно очито место 
за постављање такве границе, па се "
 "нећемо противити ма где да је поставите."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Different threshold levels would lead to different choices of name for the "
 "system.  But one name that cannot result from concerns of fairness and "
@@ -1699,7 +1710,7 @@
 "„Линукс“. Не може да буде правично одати 
признање једном споредном доприносу "
 "(Линуксу) а не поменути главни допринос 
(ГНУ)."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 #, fuzzy
 #| msgid ""
 #| "Many companies contributed to the system as it is today; doesn't that "
@@ -1716,7 +1727,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#manycompanies"
 "\">#manycompanies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "systemd is a fairly important component, but not as important as the kernel "
 "(Linux), nor as important as the basis of the system as a whole (GNU).  "
@@ -1724,7 +1735,7 @@
 "system &ldquo;GNU/systemd/Linux&rdquo;, there is nothing wrong with doing so."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today, but they don't "
 "insist on calling it XYZ/Linux.  Why should we treat GNU specially? <span "
@@ -1734,7 +1745,7 @@
 "али они не инсистирају на називу АБВ са 
Линуксом. Зашто бисмо издвајали ГНУ? "
 "<span class=\"anchor-reference-id\">(<a href=\"#others\">#others</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Thousands of projects have developed programs commonly included in today's "
 "GNU/Linux systems.  They all deserve credit for their contributions, but "
@@ -1746,7 +1757,7 @@
 "али они нису основни градитељи система 
као целине, па стога ни не траже да "
 "им се ода признање."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is different because it is more than just a contributed program, more "
 "than just a collection of contributed programs.  GNU is the framework on "
@@ -1755,7 +1766,7 @@
 "ГНУ се разликује јер је нешто више од 
приложеног програма, више чак и од "
 "скупа приложених програма. ГНУ је основа 
на којој је изграђен систем."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "GNU is a small fraction of the system nowadays, so why should we mention it? "
 "<span class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</"
@@ -1764,7 +1775,7 @@
 "ГНУ је данас мали део система. Зашто бисмо 
га онда помињали? <span class="
 "\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In 2008, we found that GNU packages made up 15% of the &ldquo;main&rdquo; "
 "repository of the gNewSense GNU/Linux distribution.  Linux made up 1.5%.  So "
@@ -1776,7 +1787,7 @@
 "исти аргумент могао да се примени са 
појачаним смислом на називање система "
 "„Линуксом“."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is a small fraction of the system nowadays, and Linux is an even smaller "
 "fraction.  But they are the system's core; the system was made by combining "
@@ -1786,7 +1797,7 @@
 "представљају срж система. Систем је 
направљен њиховим комбиновањем. Зато је "
 "назив ГНУ са Линуксом и даље исправан."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many companies contributed to the system as it is today; doesn't that mean "
 "we ought to call it GNU/Red&nbsp;Hat/Novell/Linux? <span class=\"anchor-"
@@ -1797,7 +1808,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#manycompanies"
 "\">#manycompanies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is not comparable to Red Hat or Novell; it is not a company, or an "
 "organization, or even an activity.  GNU is an operating system.  (When we "
@@ -1810,7 +1821,7 @@
 "Пројекту ГНУ, онда мислимо на пројекат да 
се изгради систем ГНУ.) Систем ГНУ "
 "са Линуксом је заснован на ГНУ-у, и зато 
ГНУ треба да буде део његовог имена."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Much of those companies' contribution to the GNU/Linux system lies in the "
 "code they have contributed to various GNU packages including GCC and GNOME.  "
@@ -1822,7 +1833,7 @@
 "ГНУ са Линуксом одајемо признање и тим 
фирмама, заједно са свим осталим ГНУ-"
 "овим градитељима."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
@@ -1831,7 +1842,7 @@
 "Зашто пишете „ГНУ са Линуксом“ уместо 
„ГНУ Линукс“? <span class=\"anchor-"
 "reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean "
@@ -1844,7 +1855,7 @@
 "„Линукс, који је ГНУ-ов пакет“. Ниједно од 
ових значења не одговара стварном "
 "стању."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is not a GNU package; that is, it wasn't developed under the GNU "
 "Project's aegis or contributed specifically to the GNU Project.  Linus "
@@ -1856,14 +1867,24 @@
 "као сопствени пројекат. Дакле, значење 
„Линукс, који је ГНУ-ов пакет“ није "
 "исправно."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "We're not talking about a distinct GNU version of Linux, the kernel.  The "
+#| "free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/";
+#| "project/linux\">separate version of Linux</a>, since the &ldquo;"
+#| "standard&rdquo; version contains non-free firmware &ldquo;blobs&rdquo;.  "
+#| "If this were part of the GNU Project, it could be considered &ldquo;GNU "
+#| "Linux&rdquo;; but we would not want to call it that, because it would be "
+#| "too confusing."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
-"free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/project/";
-"linux\">separate version of Linux</a>, since the &ldquo;standard&rdquo; "
-"version contains non-free firmware &ldquo;blobs&rdquo;.  If this were part "
-"of the GNU Project, it could be considered &ldquo;GNU Linux&rdquo;; but we "
-"would not want to call it that, because it would be too confusing."
+"free GNU/Linux distros do have a <a href=\"https://directory.fsf.org/wiki/";
+"Linux-libre\">separate version of Linux</a>, since the &ldquo;"
+"standard&rdquo; version contains nonfree firmware &ldquo;blobs&rdquo;.  If "
+"this were part of the GNU Project, it could be considered &ldquo;GNU "
+"Linux&rdquo;; but we would not want to call it that, because it would be too "
+"confusing."
 msgstr ""
 "Не ради се ни о одвојеној ГНУ-овој верзији 
Линукса, језгра. Слободне "
 "дистрибуције ГНУ-а са Линуксом заиста 
имају <a href=\"http://directory.fsf.";
@@ -1872,7 +1893,7 @@
 "би се могла сматрати „ГНУ-овим Линуксом“ 
(енгл. <em>GNU Linux</em>), али ми "
 "не бисмо желели да је тако називамо јер би 
то било збуњујуће."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We're talking about a version of GNU, the operating system, distinguished by "
 "having Linux as the kernel.  A slash fits the situation because it means "
@@ -1885,7 +1906,7 @@
 "пример, „улаз/излаз“.) Овај систем је 
комбинација ГНУ-а и Линукса. Стога је "
 "исправно „ГНУ са Линуксом“."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are other ways to express &ldquo;combination&rdquo;.  If you think "
 "that a plus-sign is clearer, please use that.  In French, a hyphen is clear: "
@@ -1896,7 +1917,7 @@
 "знак „плус“ јаснији, користите њега. У 
француском је прикладнија цртица: "
 "<em>GNU-Linux</em>.  Ми понекад на шпанском кажемо 
<em>GNU con Linux</em>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 #, fuzzy
 #| msgid ""
 #| "Should we say &ldquo;GNU/BSD&rdquo; too? <span class=\"anchor-reference-id"
@@ -1908,14 +1929,14 @@
 "Треба ли користити и назив „ГНУ са 
БСД-ом“? <span class=\"anchor-reference-id"
 "\">(<a href=\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please pronounce it as &ldquo;GNU slash Linux.&rdquo; If you don't pronounce "
 "the slash, people will think you are saying &ldquo;GNU Linux,&rdquo; which "
 "is <a href=\"#whyslash\">not a suitable name for the combination</a>."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 #, fuzzy
 #| msgid ""
 #| "Why do you write &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU "
@@ -1929,7 +1950,7 @@
 "Зашто пишете „ГНУ са Линуксом“ уместо 
„ГНУ Линукс“? <span class=\"anchor-"
 "reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 #, fuzzy
 #| msgid ""
 #| "Following the rules of English, in the construction &ldquo;GNU "
@@ -1948,14 +1969,14 @@
 "„Линукс, који је ГНУ-ов пакет“. Ниједно од 
ових значења не одговара стварном "
 "стању."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;GNU/Emacs&rdquo; would mean the combination of GNU, the operating "
 "system, and the program Emacs.  That doesn't fit this program, so &ldquo;GNU/"
 "Emacs&rdquo; is the wrong way to refer to it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why &ldquo;GNU/Linux&rdquo; rather than &ldquo;Linux/GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
@@ -1963,7 +1984,7 @@
 "Зашто „ГНУ са Линуксом“ уместо „Линукс 
са ГНУ-ом“? <span class=\"anchor-"
 "reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is right and proper to mention the principal contribution first.  The GNU "
 "contribution to the system is not only bigger than Linux and prior to Linux, "
@@ -1973,13 +1994,13 @@
 "допринос ГНУ-а систему већи од Линуксовог 
доприноса и да му претходи, већ "
 "смо ми започели цео посао."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the lowest "
 "level of the system and GNU fills technically higher levels."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
 "lot better than what people usually do, which is to omit GNU entirely and "
@@ -1989,7 +2010,7 @@
 "је боље од онога што ради већина људи, а то 
је да у потпуности изостављају "
 "ГНУ, тиме стварајући утисак да је цео 
систем Линукс."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
 "say anything about what the system consists of.  Why shouldn't they call it "
@@ -1997,21 +2018,21 @@
 "\"#distronames0\">#distronames0</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling a system &ldquo;Foobar Linux&rdquo; implies that it's a flavor of "
 "&ldquo;Linux,&rdquo; and people <a href=\"#distronames\">understand it that "
 "way</a>."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If they called a GNU/Linux distro &ldquo;Foobar BSD,&rdquo; you would call "
 "that a mistake.  &ldquo;This system is not BSD,&rdquo; you would tell them.  "
 "Well, it's not Linux either."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro is called &ldquo;Foobar Linux&rdquo;; doesn't that show it's "
 "really Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
@@ -2026,7 +2047,7 @@
 # | Debian, Dragora, Musix, Trisquel, and Venenux have adopted GNU/Linux as
 # | part of their official name, and we hope that if you are involved with a
 # | different distribution, you will encourage it to do the same.+}
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 #, fuzzy
 #| msgid ""
 #| "It means that the people who make the &ldquo;Foobar Linux&rdquo; distro "
@@ -2041,7 +2062,7 @@
 "То само значи да људи који праве 
дистрибуцију „Нештонешто Линукс“ 
понављају "
 "честу грешку."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's official name is &ldquo;Foobar Linux&rdquo;; isn't it wrong to "
 "call the distro anything but &ldquo;Foobar Linux&rdquo;? <span class="
@@ -2058,7 +2079,7 @@
 # | GNU/Linux&rdquo;.  It can't be more wrong to-] correct the [-mistake
 # | than-] {+misinformation by calling+} it [-was to make the mistake.-]
 # | {+&ldquo;Foobar GNU/Linux&rdquo;.+}
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 #, fuzzy
 #| msgid ""
 #| "If it's allowed for them to change &ldquo;GNU&rdquo; to &ldquo;Foobar "
@@ -2075,7 +2096,7 @@
 "да промените у „Нештонешто(в) ГНУ са 
Линуксом“. Не може бити мање исправно "
 "да се грешка исправи него да се учини."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be more effective to ask companies such as Mandrake, Red Hat and "
 "IBM to call their distributions &ldquo;GNU/Linux&rdquo; rather than asking "
@@ -2095,7 +2116,7 @@
 # | &ldquo;This is a pure commercial decision; we expect to make more money
 # | calling it &lsquo;Linux&rsquo;.&rdquo; In other words, that company did
 # | not care what was right.
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 #, fuzzy
 #| msgid ""
 #| "It isn't a choice of one or the other&mdash;we ask companies and "
@@ -2126,7 +2147,7 @@
 # | influence at your disposal as IBM or Red Hat, but you can still help. 
 # | Together we can change the situation to the point where companies will
 # | make more profit calling it &ldquo;GNU/Linux&rdquo;.
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 #, fuzzy
 #| msgid ""
 #| "We can't make them change, but we're not the sort to give up just because "
@@ -2147,7 +2168,7 @@
 "када ће фирме зарађивати више уколико 
систем буду називале „ГНУ-ом са "
 "Линуксом“."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to reserve the name &ldquo;GNU/Linux&rdquo; for "
 "distributions that are purely free software? After all, that is the ideal of "
@@ -2159,15 +2180,26 @@
 "ГНУ-а? <span class=\"anchor-reference-id\">(<a 
href=\"#reserve\">#reserve</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+#, fuzzy
+#| msgid ""
+#| "The widespread practice of adding non-free software to the GNU/Linux "
+#| "system is a major problem for our community.  It teaches the users that "
+#| "non-free software is ok, and that using it is part of the spirit of "
+#| "&ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part "
+#| "of their mission to help users use non-free add-ons, and may even invite "
+#| "salesmen to come and make sales pitches for them.  They adopt goals such "
+#| "as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them "
+#| "use non-free applications and drivers), or making the system more popular "
+#| "even at the cost of freedom."
 msgid ""
-"The widespread practice of adding non-free software to the GNU/Linux system "
-"is a major problem for our community.  It teaches the users that non-free "
+"The widespread practice of adding nonfree software to the GNU/Linux system "
+"is a major problem for our community.  It teaches the users that nonfree "
 "software is ok, and that using it is part of the spirit of &ldquo;"
 "Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of their "
-"mission to help users use non-free add-ons, and may even invite salesmen to "
+"mission to help users use nonfree add-ons, and may even invite salesmen to "
 "come and make sales pitches for them.  They adopt goals such as &ldquo;"
-"helping the users&rdquo; of GNU/Linux (including helping them use non-free "
+"helping the users&rdquo; of GNU/Linux (including helping them use nonfree "
 "applications and drivers), or making the system more popular even at the "
 "cost of freedom."
 msgstr ""
@@ -2181,11 +2213,11 @@
 "апликација и управљачких програма), или 
популарисање система чак и по цену "
 "губитка слободе."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The question is how to try to change this."
 msgstr "Питање је како ово променити."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Given that most of the community which uses GNU with Linux already does not "
 "realize that's what it is, for us to disown these adulterated versions, "
@@ -2199,13 +2231,22 @@
 "би схватили жељену поруку, већ би 
одговорили да нису ни помишљали на то да "
 "су ови системи уопште ГНУ."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The way to lead these users to see a connection with freedom is exactly "
+#| "the opposite: to inform them that all these system versions <em>are</em> "
+#| "versions of GNU, that they all are based on a system that exists "
+#| "specifically for the sake of the users' freedom.  With this "
+#| "understanding, they can start to recognize the distributions that include "
+#| "non-free software as perverted, adulterated versions of GNU, instead of "
+#| "thinking they are proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgid ""
 "The way to lead these users to see a connection with freedom is exactly the "
 "opposite: to inform them that all these system versions <em>are</em> "
 "versions of GNU, that they all are based on a system that exists "
 "specifically for the sake of the users' freedom.  With this understanding, "
-"they can start to recognize the distributions that include non-free software "
+"they can start to recognize the distributions that include nonfree software "
 "as perverted, adulterated versions of GNU, instead of thinking they are "
 "proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgstr ""
@@ -2216,7 +2257,7 @@
 "гледају као на изопачене и искварене 
верзије ГНУ-а, уместо да на њих гледају "
 "као на исправне и прикладне „верзије 
Линукса“."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is very useful to start GNU/Linux User Groups, which call the system GNU/"
 "Linux and adopt the ideals of the GNU Project as a basis for their "
@@ -2234,7 +2275,7 @@
 "посвећују површнијим циљевима имају 
право на своја гледишта, али им немојте "
 "дозволити да повуку и вас!"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not make a GNU distribution of Linux (sic) and call that GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
@@ -2244,7 +2285,7 @@
 "Линуксом? <span class=\"anchor-reference-id\">(<a href=\"#gnudist"
 "\">#gnudist</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "All the &ldquo;Linux&rdquo; distributions are actually versions of the GNU "
 "system with Linux as the kernel.  The purpose of the term &ldquo;GNU/"
@@ -2257,7 +2298,7 @@
 "дистрибуције која би се звала „ГНУ са 
Линуксом“ бисмо заклонили оно што "
 "желимо да поручимо."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "As for developing a distribution of GNU/Linux, we already did this once, "
 "when we funded the early development of Debian GNU/Linux.  To do it again "
@@ -2271,7 +2312,7 @@
 "уколико би нова дистрибуција имала 
значајну практичну предност над другим "
 "дистрибуцијама, било би узалудно."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Instead we help the developers of 100% free GNU/Linux distributions, such as "
 "gNewSense and Ututo."
@@ -2279,7 +2320,7 @@
 "Уместо тога, ми помажемо градитељима 100% 
слободних дистрибуција ГНУ-а са "
 "Линуксом, као што су <em>gNewSense</em> и <em>Ututo</em>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not just say &ldquo;Linux is the GNU kernel&rdquo; and release some "
 "existing version of GNU/Linux under the name &ldquo;GNU&rdquo;? <span class="
@@ -2289,7 +2330,7 @@
 "а са Линуксом под именом „ГНУ“? <span 
class=\"anchor-reference-id\">(<a href="
 "\"#linuxgnu\">#linuxgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It might have been a good idea to adopt Linux as the GNU kernel back in "
 "1992.  If we had realized, then, how long it would take to get the GNU Hurd "
@@ -2300,7 +2341,7 @@
 "оспособимо ГНУ-ово Крдо, можда бисмо онда 
то и урадили. (Авај, то смо касно "
 "схватили.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we were to take an existing version of GNU/Linux and relabel it as &ldquo;"
 "GNU&rdquo;, that would be somewhat like making a version of the GNU system "
@@ -2312,7 +2353,7 @@
 "верзије система ГНУ у „Линукс“. То није 
било исправно, и ми тако нећемо да "
 "поступамо."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Did the GNU Project condemn and oppose use of Linux in the early days? <span "
 "class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
@@ -2321,7 +2362,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We did not adopt Linux as our kernel, but we didn't condemn or oppose it.  "
 "In 1993 we started discussing the arrangements to sponsor the development of "
@@ -2340,7 +2381,7 @@
 "мењане на брзину и на непреносив начин; за 
инсталацију је било потребно да "
 "се измене прочисте."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who had made the changes showed little interest in cooperating "
 "with us.  One of them actually told us that he didn't care about working "
@@ -2358,7 +2399,7 @@
 "систем који је био углавном заснован на 
ГНУ-у, је била прва (и за сада "
 "једина) група која није желела да сарађује 
са нама."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It was this experience that first showed us that people were calling a "
 "version of the GNU system &ldquo;Linux&rdquo;, and that this confusion was "
@@ -2371,7 +2412,7 @@
 "раду. Наш одговор на тај и друге проблеме 
проузроковане погрешним називањем "
 "система је да молимо људе да називају 
систем „ГНУ-ом са Линуксом“."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why did you wait so long before asking people to use the name GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
@@ -2380,7 +2421,7 @@
 "људи да користе назив ГНУ са Линуксом? <span 
class=\"anchor-reference-id\">"
 "(<a href=\"#wait\">#wait</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually we didn't.  We began talking privately with developers and "
 "distributors about this in 1994, and made a more public campaign in 1996.  "
@@ -2390,7 +2431,7 @@
 "градитељима и расподељивачима 1994. године, 
а са јавном кампањом смо почели "
 "1996. године. Наставићемо са њом онолико 
колико је то потребно."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should the GNU/<i>name</i> convention be applied to all programs that are "
 "GPL'ed? <span class=\"anchor-reference-id\">(<a href=\"#allgpled"
@@ -2400,7 +2441,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#allgpled\">#allgpled</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We never refer to individual programs as &ldquo;GNU/<i>name</i>&rdquo;.  "
 "When a program is a GNU package, we may call it &ldquo;GNU <i>name</"
@@ -2410,7 +2451,7 @@
 "[назив]“ (енг. <em>GNU/</em>[назив]). Уколико је 
програм ГНУ-ов пакет, ми га "
 "називамо „ГНУ-ов [назив]“."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU, the operating system, is made up of many different programs.  Some of "
 "the programs in GNU were written as part of the GNU Project or specifically "
@@ -2421,7 +2462,7 @@
 "чине ГНУ су написани у оквиру Пројекта ГНУ 
или му посебно приложени; то су "
 "ГНУ-ови пакети, па стога ми често 
користимо реч „ГНУ“ у њиховим називима."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It's up to the developers of a program to decide if they want to contribute "
 "it and make it a GNU package.  If you have developed a program and you would "
@@ -2435,7 +2476,7 @@
 "gnu@gnu.org&gt;</a>, како бисмо могли да га 
испитамо и одлучимо да ли нам је "
 "потребан."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It wouldn't be fair to put the name GNU on every individual program that is "
 "released under the GPL.  If you write a program and release it under the "
@@ -2454,7 +2495,7 @@
 "ГНУ-ов пакет, за то „нешто“ Пројекат ГНУ 
не може да буде заслужан, па би "
 "додавање назива „ГНУ“ у његов назив било 
погрешно."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In contrast, we do deserve the overall credit for the GNU operating system "
 "as a whole, even though not for each and every program in it.  The system "
@@ -2466,7 +2507,7 @@
 "такав управо захваљујући нашој 
одлучности и упорности, још од 1984., много "
 "година пре настанка Линукса."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The operating system in which Linux became popular was basically the same as "
 "the GNU operating system.  It was not entirely the same, because it had a "
@@ -2478,7 +2519,7 @@
 "али је углавном исти систем. Он је 
варијанта ГНУ-а — он је систем ГНУ са "
 "Линуксом."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux continues to be used primarily in derivatives of that system&mdash;in "
 "today's versions of the GNU/Linux system.  What gives these systems their "
@@ -2489,7 +2530,7 @@
 "верзијама система ГНУ са Линуксом. Оно што 
тим системима даје идентитет "
 "јесте ГНУ са Линуксом у њиховом средишту, 
а не искључиво Линукс."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since much of GNU comes from Unix, shouldn't GNU give credit to Unix by "
 "using &ldquo;Unix&rdquo; in its name? <span class=\"anchor-reference-id\">"
@@ -2499,7 +2540,7 @@
 "признање Униксу додавши Уникс свом 
називу? <span class=\"anchor-reference-id"
 "\">(<a href=\"#unix\">#unix</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Actually, none of GNU comes from Unix.  Unix was proprietary software (and "
 "still is), so using any of its code in GNU would have been illegal.  This is "
@@ -2516,7 +2557,7 @@
 "би их заменио. Ми нисмо могли да копирамо 
програме, па чак ни њихове делове, "
 "из Уникса; све је морало да се наново 
напише."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "No code in GNU comes from Unix, but GNU is a Unix-compatible system; "
 "therefore, many of the ideas and specifications of GNU do come from Unix.  "
@@ -2529,13 +2570,22 @@
 "представља комичан начин одавања почасти 
Униксу, у складу са хакерском "
 "традицијом рекурзивних скраћеница која 
потиче из седамдесетих."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The first such recursive acronym was TINT, &ldquo;TINT Is Not "
+#| "TECO&rdquo;.  The author of TINT wrote another implementation of TECO "
+#| "(there were already many of them, for various systems), but instead of "
+#| "calling it by a dull name like &ldquo;<em>somethingorother</em> "
+#| "TECO&rdquo;, he thought of a clever amusing name.  (That's what hacking "
+#| "means: <a href=\"http://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
 "The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
 "The author of TINT wrote another implementation of TECO (there were already "
 "many of them, for various systems), but instead of calling it by a dull name "
 "like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of a clever "
-"amusing name.  (That's what hacking means: <a href=\"http://stallman.org/";
+"amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
 "Прва таква рекурзивна скраћеница је била 
ТНТ, „ТНТ није Теко“ (енг. "
@@ -2545,7 +2595,7 @@
 "интелигентно и забавно име. (Управо то и 
значи хакерисање: <a href=\"http://";
 "stallman.org/articles/on-hacking.html\">разиграна 
бистрина</a>.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Other hackers enjoyed that name so much that we imitated the approach.  It "
 "became a tradition that, when you were writing from scratch a program that "
@@ -2561,7 +2611,7 @@
 "Образован“<sup><a href=\"#TransNote4\">[4]</a></sup>. У том 
духу смо нашој "
 "замени за Уникс дали име „ГНУ није 
Уникс“."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Historically, AT&amp;T which developed Unix did not want anyone to give it "
 "credit by using &ldquo;Unix&rdquo; in the name of a similar system, not even "
@@ -2579,7 +2629,7 @@
 "верзије Уникса (наравно, све власничке као 
и сам Уникс) које су произвеле "
 "разне рачунарске фирме зову другачије."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we say &ldquo;GNU/BSD&rdquo; too? <span class=\"anchor-reference-id\">"
 "(<a href=\"#bsd\">#bsd</a>)</span>"
@@ -2587,7 +2637,7 @@
 "Треба ли користити и назив „ГНУ са 
БСД-ом“? <span class=\"anchor-reference-id"
 "\">(<a href=\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems, "
 "because that term does not fit the history of the BSD systems."
@@ -2595,9 +2645,15 @@
 "Ми не називамо системе БСД (ФриБСД, итд.) 
системима „ГНУ са БСД-ом“,\n"
 "јер се тај израз не уклапа у историјат 
система БСД."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The BSD system was developed by UC Berkeley as non-free software in the "
+#| "80s, and became free in the early 90s.  A free operating system that "
+#| "exists today is almost certainly either a variant of the GNU system, or a "
+#| "kind of BSD system."
 msgid ""
-"The BSD system was developed by UC Berkeley as non-free software in the 80s, "
+"The BSD system was developed by UC Berkeley as nonfree software in the 80s, "
 "and became free in the early 90s.  A free operating system that exists today "
 "is almost certainly either a variant of the GNU system, or a kind of BSD "
 "system."
@@ -2606,7 +2662,7 @@
 "осамдесетих, а ослобођен је раних 
деведесетих. Данас је слободни оперативни "
 "систем скоро сигурно или варијанта 
система ГНУ или врста система БСД."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "People sometimes ask whether BSD too is a variant of GNU, as GNU/Linux is.  "
 "It is not.  The BSD developers were inspired to make their code free "
@@ -2620,7 +2676,7 @@
 "молбе активиста ГНУ-а су помогле да их 
убедимо да са тим почну, али сам код "
 "има мало заједничког са ГНУ-ом."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "BSD systems today use some GNU packages, just as the GNU system and its "
 "variants use some BSD programs; however, taken as wholes, they are two "
@@ -2634,7 +2690,7 @@
 "БСД-а нису написали језгро и додали га 
систему ГНУ, па назив ГНУ са БСД-ом "
 "не би био примерен."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The connection between GNU/Linux and GNU is much closer, and that's why the "
 "name &ldquo;GNU/Linux&rdquo; is appropriate for it."
@@ -2642,7 +2698,7 @@
 "Веза између ГНУ-а са Линуксом и ГНУ-а је 
много тешња, и зато је назив „ГНУ "
 "са Линуксом“ погодан."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is a version of GNU which uses the kernel from NetBSD.  Its developers "
 "call it &ldquo;Debian GNU/NetBSD&rdquo;, but &ldquo;GNU/"
@@ -2655,7 +2711,7 @@
 "НетБСД-а“, јер је НетБСД потпун систем, а 
не само језгро. Ово није систем "
 "БСД, јер је већина система иста као код 
система ГНУ са Линуксом."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "If I install the GNU tools on Windows, does that mean I am running a GNU/"
 "Windows system? <span class=\"anchor-reference-id\">(<a href=\"#othersys"
@@ -2665,7 +2721,7 @@
 "систем ГНУ са Виндовсом? <span 
class=\"anchor-reference-id\">(<a href="
 "\"#othersys\">#othersys</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
 "GNU are just a part of the GNU software, which is just a part of the GNU "
@@ -2682,7 +2738,7 @@
 # | Can't [-there be-] Linux [-systems-] {+be used+} without GNU? {+<span
 # | class=\"anchor-reference-id\">(<a
 # | href=\"#justlinux\">#justlinux</a>)</span>+}
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 #, fuzzy
 #| msgid "Can't there be Linux systems without GNU?"
 msgid ""
@@ -2716,7 +2772,7 @@
 # | would-] {+these appliances run just Linux, to+} show [-users-] how [-these
 # | systems-] {+different those small platforms+} are [-different.</p>-]
 # | {+from GNU/Linux.+}
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 #, fuzzy
 #| msgid ""
 #| "It is possible to make a system that uses Linux as the kernel but is not "
@@ -2768,19 +2824,19 @@
 "језгром. Ови различити називи би 
демонстрирали корисницима колико су ти "
 "системи различити.</p>"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How much of the GNU system is needed for the system to be GNU/Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "&ldquo;How much&rdquo; is not a meaningful question because the GNU system "
 "does not have precise boundaries."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is an operating system maintained by a community.  It includes far more "
 "than just the GNU software packages (of which we have a specific list), and "
@@ -2790,35 +2846,35 @@
 "much&rdquo; you used."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we look at the level of packages, Linux is one important package in the "
 "GNU/Linux system.  The inclusion of one important GNU package is enough to "
 "justify our request for equal mention."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Are there complete Linux systems [sic] without GNU? <span class=\"anchor-"
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
 "span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There are complete systems that contain Linux and not GNU; Android is an "
 "example.  But it is a mistake to call them &ldquo;Linux&rdquo; systems, just "
 "as it is a mistake to call GNU a &ldquo;Linux&rdquo; system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android is very different from the GNU/Linux system&mdash;because the two "
 "have very little code in common.  In fact, the only thing they have in "
 "common is Linux."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
 "necessary to say things like, &ldquo;Android contains Linux, but it isn't "
@@ -2826,7 +2882,7 @@
 "[meaning the GNU system].&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android contains just as much of Linux as GNU/Linux does.  What it doesn't "
 "have is the GNU system.  Android replaces that with Google software that "
@@ -2834,7 +2890,7 @@
 "absence of GNU."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Is it correct to say &ldquo;using Linux&rdquo; if it refers to using GNU/"
 "Linux and using Android? <span class=\"anchor-reference-id\">(<a href="
@@ -2842,27 +2898,27 @@
 "\">#usegnulinuxandandroidlinuxsyswithoutgnu</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Far from it.  That usage is so strained that people will not understand the "
 "intended meaning."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public will find it very strange to speak of using Android as &ldquo;"
 "using Linux&rdquo;.  It's like having a conversation, then saying you were "
 "conversing with the person's intestines or the person's circulatory system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public <em>will</em> understand the idea of &ldquo;using Linux&rdquo; "
 "when it's really GNU/Linux, by way of the usual misunderstanding: thinking "
 "of the whole system as &ldquo;Linux&rdquo;."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Use of Android and use of GNU/Linux are totally different, as different as "
 "driving a car and riding a bicycle.  The fact that the first two both "
@@ -2875,7 +2931,7 @@
 "GNU/Linux and Android.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not call the system &ldquo;Linux&rdquo; anyway, and strengthen Linus "
 "Torvalds' role as posterboy for our community? <span class=\"anchor-"
@@ -2885,7 +2941,7 @@
 "Линуса Торвалдса као маскоте наше 
заједнице? <span class=\"anchor-reference-"
 "id\">(<a href=\"#helplinus\">#helplinus</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Linus Torvalds is the &ldquo;posterboy&rdquo; (other people's choice of "
 "word, not ours) for his goals, not ours.  His goal is to make the system "
@@ -2902,12 +2958,22 @@
 "\">слободу сарадње</a> као етичко начело, 
због чега јавност назив „Линукс“ "
 "не повезује са тим начелом."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Linus publicly states his disagreement with the free software movement's "
+#| "ideals.  He developed non-free software in his job for many years (and "
+#| "said so to a large audience at a &ldquo;Linux&rdquo;World show), and "
+#| "publicly invited fellow developers of Linux, the kernel, to use non-free "
+#| "software to work on it with him.  He goes even further, and rebukes "
+#| "people who suggest that engineers and scientists should consider social "
+#| "consequences of our technical work&mdash;rejecting the lessons society "
+#| "learned from the development of the atom bomb."
 msgid ""
 "Linus publicly states his disagreement with the free software movement's "
-"ideals.  He developed non-free software in his job for many years (and said "
+"ideals.  He developed nonfree software in his job for many years (and said "
 "so to a large audience at a &ldquo;Linux&rdquo;World show), and publicly "
-"invited fellow developers of Linux, the kernel, to use non-free software to "
+"invited fellow developers of Linux, the kernel, to use nonfree software to "
 "work on it with him.  He goes even further, and rebukes people who suggest "
 "that engineers and scientists should consider social consequences of our "
 "technical work&mdash;rejecting the lessons society learned from the "
@@ -2921,7 +2987,7 @@
 "и научници требало да размотре друштвене 
последице њихових техничких дела — "
 "одбацујући тиме лекцију које је друштво 
извукло из развоја атомске бомбе."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with writing a free program for the motivations of "
 "learning and having fun; the kernel Linus wrote for those reasons was an "
@@ -2940,7 +3006,7 @@
 "гледишта, али ми сматрамо да људи треба да 
знају да оперативни систем о коме "
 "се говори потиче из идеала слободе, а не из 
његових ставова."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong for us to label Linus Torvalds' work as GNU? <span class="
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
@@ -2948,7 +3014,7 @@
 "Зар није погрешно означавати дело Линуса 
Торвалдса ГНУ-ом? <span class="
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong, so we don't do that.  Torvalds' work is Linux, the "
 "kernel; we are careful not to attribute that work to the GNU Project or "
@@ -2960,7 +3026,7 @@
 "ом“. Када говоримо о целом систему, назив 
„ГНУ са Линуксом“ му даје део "
 "заслуга."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Does Linus Torvalds agree that Linux is just the kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
@@ -2968,10 +3034,17 @@
 "Да ли се Линус Торвалдс слаже са тим да је 
Линукс само језгро? <span class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
+#| "versions/RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are "
+#| "GNU software and are under the GNU copyleft. These tools aren't in the "
+#| "distribution - ask me (or GNU)  for more info&rdquo;</a>."
 msgid ""
 "He recognized this at the beginning.  The earliest Linux release notes said, "
-"<a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"<a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
 "RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are GNU software "
 "and are under the GNU copyleft. These tools aren't in the distribution - ask "
 "me (or GNU)  for more info&rdquo;</a>."
@@ -2982,29 +3055,29 @@
 "софтвер, и они су под ГНУ-овим копилефтом. 
Ти алати нису у дистрибуцији. За "
 "више података се обратите мени или 
ГНУ-у</a>.“"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not finish the GNU Hurd kernel, release the GNU system as a whole, and "
 "forget the question of what to call GNU/Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#finishhurd\">#finishhurd</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We would like credit for the GNU operating system no matter which kernel is "
 "used with it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Making the GNU Hurd work well enough to compete with Linux would be a big "
 "job, and it's not clearly necessary.  The only thing ethically wrong with "
 "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the best "
-"fix for that problem is <a href=\"http://fsf.org/campaigns/priority-projects";
-"\"> developing free replacement for the blobs</a>."
+"fix for that problem is <a href=\"https://www.fsf.org/campaigns/priority-";
+"projects\"> developing free replacement for the blobs</a>."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The battle is already lost&mdash;society has made its decision and we can't "
 "change it, so why even think about it? <span class=\"anchor-reference-id\">"
@@ -3014,7 +3087,7 @@
 "Зашто бисмо чак и помишљали на то? <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#lost\">#lost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This isn't a battle, it is a campaign of education.  What to call the system "
 "is not a single decision, to be made at one moment by &ldquo;society&rdquo;: "
@@ -3029,7 +3102,7 @@
 "наредите другима да говоре „ГНУ са 
Линуксом“, али зато можете да сами "
 "називате систем „ГНУ-ом са Линуксом“, и 
тако нам помогнете."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Society has made its decision and we can't change it, so what good does it "
 "do if I say &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id\">(<a "
@@ -3039,7 +3112,7 @@
 "бих говорио „ГНУ са Линуксом“? <span 
class=\"anchor-reference-id\">(<a href="
 "\"#whatgood\">#whatgood</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is not an all-or-nothing situation: correct and incorrect pictures are "
 "being spread more or less by various people.  If you call the system &ldquo;"
@@ -3058,7 +3131,7 @@
 "приметило да користите израз „ГНУ са 
Линуксом“, то је много боље него да то "
 "нико није приметио. А неки од њих ће о овој 
исправци испричати другима."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to call the system &ldquo;Linux&rdquo; and teach "
 "people its real origin with a ten-minute explanation? <span class=\"anchor-"
@@ -3068,7 +3141,7 @@
 "пореклу десетоминутним објашњењем? <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#explain\">#explain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "If you help us by explaining to others in that way, we appreciate your "
 "effort, but that is not the best method.  It is not as effective as calling "
@@ -3078,7 +3151,7 @@
 "није најбољи начин. То није толико ефектно 
као називање система „ГНУ-ом са "
 "Линуксом“, и неефикасно троши ваше време."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is ineffective because it may not sink in, and surely will not "
 "propagate.  Some of the people who hear your explanation will pay attention, "
@@ -3093,7 +3166,7 @@
 "сваки пут када говоре о систему. Они ће га 
вероватно називати „Линуксом“, и "
 "тиме без посебне намере раширити погрешну 
слику."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is inefficient because it takes a lot more time.  Saying and writing "
 "&ldquo;GNU/Linux&rdquo; will take you only a few seconds a day, not minutes, "
@@ -3107,7 +3180,7 @@
 "Линуксом у говору и писању је далеко лакши 
начин да стварно помогнете "
 "Пројекту ГНУ."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people laugh at you when you ask them to call the system GNU/Linux.  "
 "Why do you subject yourself to this treatment? <span class=\"anchor-"
@@ -3117,7 +3190,7 @@
 "Зашто се излагати томе? <span 
class=\"anchor-reference-id\">(<a href="
 "\"#treatment\">#treatment</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; tends to give people a mistaken "
 "picture of the system's history and reason for existence.  People who laugh "
@@ -3131,7 +3204,7 @@
 "када ми тражимо да се признање за посао 
ода нама. Када би били упознати са "
 "истином, вероватно се не би смејали."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Why do we take the risk of making a request that sometimes leads people to "
 "ridicule us? Because often it has useful results that help the GNU Project.  "
@@ -3142,7 +3215,7 @@
 "Пројекат ГНУ. Ми ћемо се изложити ризику 
незаслуженог исмевања да бисмо "
 "постигли наше циљеве."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you see such an ironically unfair situation occurring, please don't sit "
 "idly by.  Please teach the laughing people the real history.  When they see "
@@ -3153,7 +3226,7 @@
 "зашто је захтев оправдан, они који имају 
имало образа ће престати са "
 "смејањем."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people condemn you when you ask them to call the system GNU/Linux.  "
 "Don't you lose by alienating them? <span class=\"anchor-reference-id\">(<a "
@@ -3163,7 +3236,7 @@
 "Линуксом. Зар отуђивање од њих не 
представља губитак? <span class=\"anchor-"
 "reference-id\">(<a href=\"#alienate\">#alienate</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not much.  People who don't appreciate our role in developing the system are "
 "unlikely to make substantial efforts to help us.  If they do work that "
@@ -3179,7 +3252,7 @@
 "време, подучавајући друге да припишу наше 
дело неком другом, они поткопавају "
 "нашу могућност да искористимо помоћ 
других."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It makes no sense to worry about alienating people who are already mostly "
 "uncooperative, and it is self-defeating to be deterred from correcting a "
@@ -3191,7 +3264,7 @@
 "проблем у жељи да не наљутимо људе који га 
овековечују. Стога ћемо наставити "
 "са покушајима да исправимо погрешан 
назив."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Whatever you contributed, is it legitimate to rename the operating system? "
 "<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
@@ -3200,7 +3273,7 @@
 "допринели? <span class=\"anchor-reference-id\">(<a 
href=\"#rename\">#rename</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are not renaming anything; we have been calling this system &ldquo;"
 "GNU&rdquo; ever since we announced it in 1983.  The people who tried to "
@@ -3210,7 +3283,7 @@
 "започели, 1983. године. Они који су покушали 
да га преименују у „Линукс“ "
 "није требало то да ураде."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong to force people to call the system &ldquo;GNU/Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
@@ -3218,7 +3291,7 @@
 "Зар није погрешно присиљавати људе да 
називају систем „ГНУ-ом са Линуксом“? "
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong to force them, and we don't try.  We call the system "
 "&ldquo;GNU/Linux&rdquo;, and we ask you to do it too."
@@ -3226,7 +3299,7 @@
 "Било би погрешно присиљавати их, и зато то 
ни не покушавамо. Ми називамо "
 "систем „ГНУ-ом са Линуксом“ и молимо вас 
да и ви то радите."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not sue people who call the whole system &ldquo;Linux&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
@@ -3234,7 +3307,7 @@
 "Зашто не тужити људе који називају цео 
систем „Линуксом“? <span class="
 "\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are no legal grounds to sue them, but since we believe in freedom of "
 "speech, we wouldn't want to do that anyway.  We ask people to call the "
@@ -3244,7 +3317,7 @@
 "ми ионако не бисмо желели да то урадимо. Ми 
молимо људе да називају систем "
 "„ГНУ-ом са Линуксом“ због тога што је то 
исправно."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Shouldn't you put something in the GNU GPL to require people to call the "
 "system &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id\">(<a href="
@@ -3254,13 +3327,23 @@
 "„ГНУ-ом“? <span class=\"anchor-reference-id\">(<a href=\"#require"
 "\">#require</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU GPL is to protect the users' freedom from those "
+#| "who would make proprietary versions of free software.  While it is true "
+#| "that those who call the system &ldquo;Linux&rdquo; often do things that "
+#| "limit the users' freedom, such as bundling non-free software with the GNU/"
+#| "Linux system or even developing non-free software for such use, the mere "
+#| "act of calling the system &ldquo;Linux&rdquo; does not, in itself, deny "
+#| "users their freedom.  It seems improper to make the GPL restrict what "
+#| "name people can use for the system."
 msgid ""
 "The purpose of the GNU GPL is to protect the users' freedom from those who "
 "would make proprietary versions of free software.  While it is true that "
 "those who call the system &ldquo;Linux&rdquo; often do things that limit the "
-"users' freedom, such as bundling non-free software with the GNU/Linux system "
-"or even developing non-free software for such use, the mere act of calling "
+"users' freedom, such as bundling nonfree software with the GNU/Linux system "
+"or even developing nonfree software for such use, the mere act of calling "
 "the system &ldquo;Linux&rdquo; does not, in itself, deny users their "
 "freedom.  It seems improper to make the GPL restrict what name people can "
 "use for the system."
@@ -3273,7 +3356,7 @@
 "сам по себи не ускраћује слободу 
корисницима. Не би било исправно да ОЈЛ "
 "ограничава избор назива којим људи могу 
да називају систем."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you objected to the original BSD license's advertising requirement to "
 "give credit to the University of California, isn't it hypocritical to demand "
@@ -3285,7 +3368,7 @@
 "одавање признања Пројекту ГНУ? <span 
class=\"anchor-reference-id\">(<a href="
 "\"#BSDlicense\">#BSDlicense</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would be hypocritical to make the name GNU/Linux a license requirement, "
 "and we don't.  We only <em>ask</em> you to give us the credit we deserve."
@@ -3294,14 +3377,14 @@
 "то је један од разлога зашто то нисмо 
урадили. Ми вас само <em>молимо</em> "
 "да нам одате признање како бисте учинили 
исправну ствар."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please note that there are at least <a href=\"/licenses/bsd.html\"> two "
 "different BSD licenses</a>.  For clarity's sake, please don't use the term "
 "&ldquo;BSD license&rdquo; without specifying which one."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you failed to put something in the GNU GPL to require people to call "
 "the system &ldquo;GNU&rdquo;, you deserve what happened; why are you "
@@ -3312,7 +3395,7 @@
 "„ГНУ-ом“, заслужили сте оно што вам се 
десило. Што се сада жалите? <span "
 "class=\"anchor-reference-id\">(<a href=\"#deserve\">#deserve</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The question presupposes a rather controversial general ethical premise: "
 "that if people do not force you to treat them fairly, you are entitled to "
@@ -3324,13 +3407,13 @@
 "поштено, смете да их искористите онолико 
колико желите. Другим речима, да је "
 "исправно да „сила Бога не моли“."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope you disagree with that premise just as we do."
 msgstr ""
 "Надамо се да се са овом премисом не 
слажете, као што се ни ми са њом не "
 "слажемо."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't you be better off not contradicting what so many people believe? "
 "<span class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)"
@@ -3340,7 +3423,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't think we should go along with large numbers of people because they "
 "have been misled.  We hope you too will decide that truth is important."
@@ -3348,7 +3431,7 @@
 "Ми не мислимо да би требало да се 
придружимо великом броју људи који су "
 "заведени. Надамо се да ћете и ви одлучити 
да је важна истина."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We could never have developed a free operating system without first denying "
 "the belief, held by most people, that proprietary software was legitimate "
@@ -3358,7 +3441,7 @@
 "претходног порицања уверења, које имају 
многи, да је власнички софтвер "
 "легитиман и прихватљив."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
 "<span class=\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</"
@@ -3368,18 +3451,18 @@
 "то исправно? <span class=\"anchor-reference-id\">(<a 
href=\"#somanyright"
 "\">#somanyright</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "We don't think that the popularity of an error makes it the truth."
 msgstr "Ми не сматрамо да популарност грешку 
претвара у истину."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it better to call the system by the name most users already know? "
 "<span class=\"anchor-reference-id\">(<a href=\"#knownname\">#knownname</a>)</"
 "span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo; includes "
 "&ldquo;Linux&rdquo;, they will recognize what you're talking about.  If you "
@@ -3387,7 +3470,7 @@
 "once in a while, they will all understand."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many people care about what's convenient or who's winning, not about "
 "arguments of right or wrong.  Couldn't you get more of their support by a "
@@ -3403,7 +3486,7 @@
 # | and thrives on it.  Thus{+,+} in the long run it [-is-] {+would be+}
 # | self-defeating for us to [-bow to-] {+adopt+} that approach.  We will
 # | continue talking in terms of right and wrong.
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 #, fuzzy
 #| msgid ""
 #| "To care only about what's convenient or who's winning is an amoral "
@@ -3413,9 +3496,9 @@
 #| "right and wrong."
 msgid ""
 "To care only about what's convenient or who's winning is an amoral approach "
-"to life.  Non-free software is an example of that amoral approach and "
-"thrives on it.  Thus, in the long run it would be self-defeating for us to "
-"adopt that approach.  We will continue talking in terms of right and wrong."
+"to life.  Nonfree software is an example of that amoral approach and thrives "
+"on it.  Thus, in the long run it would be self-defeating for us to adopt "
+"that approach.  We will continue talking in terms of right and wrong."
 msgstr ""
 "Бринути само о томе шта је згодно или ко 
побеђује је неморална животна "
 "филозофија. Неслободни софтвер је пример 
те неморалне филозофије и он на њој "
@@ -3423,7 +3506,7 @@
 "приклонили тој филозофији. Наставићемо да 
размишљамо у категоријама "
 "исправног и погрешног."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope that you are one of those for whom right and wrong do matter."
 msgstr "Надамо се да сте ви од оних којима је 
битно шта је исправно."
 
@@ -3491,8 +3574,8 @@
 #| msgid ""
 #| "Copyright &copy; 2001, 2006, 2007, 2008 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation, "
+"Inc."
 msgstr ""
 "<b>Ауторска права:</b><br />Copyright &copy; 2001, 2006, 2007, 
2008 Free "
 "Software Foundation, Inc."

Index: gnu/po/gnu-linux-faq.tr.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.tr.po,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- gnu/po/gnu-linux-faq.tr.po  10 Apr 2021 06:59:59 -0000      1.87
+++ gnu/po/gnu-linux-faq.tr.po  30 Aug 2021 13:34:53 -0000      1.88
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-04-10 08:29+0200\n"
 "Last-Translator: T. E. Kalayci <tekrei@member.fsf.org>\n"
 "Language-Team: Turkish <www-tr-comm@gnu.org>\n"
@@ -19,6 +19,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.4.2\n"
 
@@ -26,29 +27,15 @@
 msgid "GNU/Linux FAQ - GNU Project - Free Software Foundation"
 msgstr "GNU/Linux SSS - GNU Projesi - Özgür Yazılım Vakfı"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU/Linux FAQ"
 msgstr "GNU/Linux SSS"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by Richard Stallman"
 msgstr "yazan Richard Stallman"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
-"linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a href=\"/"
-"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Bu konu hakkında daha fazla bilgi edinmek istiyorsanız, <a 
href=\"/gnu/linux-"
-"and-gnu.html\">Linux ve GNU Projesi</a>, <a href=\"/gnu/why-gnu-linux.html"
-"\">Neden GNU/Linux?</a> ve <a href=\"/gnu/gnu-users-never-heard-of-gnu.html"
-"\">GNU'yu Hiç Duymamış GNU Kullanıcıları</a> başlıklı 
yazılarımızı da "
-"okuyabilirsiniz."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When people see that we use and recommend the name GNU/Linux for a system "
 "that many others call just &ldquo;Linux&rdquo;, they ask many questions.  "
@@ -59,6 +46,12 @@
 "gördüklerinde pek çok soru sorabiliyorlar. İşte yaygın sorular ve "
 "yanıtlarımız."
 
+#. type: Content of: <div><div><h3>
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "İçindekiler"
+
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<a href=\"#why\">Why do you call the system we use GNU/Linux and not Linux?</"
@@ -661,7 +654,28 @@
 "kullanışlı olduğuyla veya kimin kazandığıyla ilgileniyor. Onların 
desteğini "
 "almak için farklı bir yol izleseniz olmaz mıydı?</a>"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our page on <a href=\"/"
+#| "gnu/linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a "
+#| "href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
+"linux-and-gnu.html\">Linux and the GNU System</a>, our page on <a href=\"/"
+"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Bu konu hakkında daha fazla bilgi edinmek istiyorsanız, <a 
href=\"/gnu/linux-"
+"and-gnu.html\">Linux ve GNU Projesi</a>, <a href=\"/gnu/why-gnu-linux.html"
+"\">Neden GNU/Linux?</a> ve <a href=\"/gnu/gnu-users-never-heard-of-gnu.html"
+"\">GNU'yu Hiç Duymamış GNU Kullanıcıları</a> başlıklı 
yazılarımızı da "
+"okuyabilirsiniz."
+
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you call the system we use GNU/Linux and not Linux? <span class="
 "\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>"
@@ -670,7 +684,7 @@
 "adlandırıyorsunuz? <span class=\"anchor-reference-id\">(<a href=\"#why"
 "\">#why</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Most operating system distributions based on Linux as kernel are basically "
 "modified versions of the GNU operating system.  We began developing GNU in "
@@ -689,11 +703,11 @@
 "suretiyle, bütün sisteme tek taraflı en büyük katkıyı biz sağladık. 
Ayrıca "
 "temel bakış açısı da bize aitti."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "In fairness, we ought to get at least equal mention."
 msgstr "Adil olmak açısından, en azından bizden de eşit derecede 
bahsedilmeli."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and the GNU System</a> and <a "
 "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
@@ -705,7 +719,7 @@
 "Duymamış GNU Kullanıcıları</a>; tarih için de <a 
href=\"/gnu/the-gnu-project."
 "html\">GNU Projesi</a> sayfalarına bakınız."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why is the name important? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
@@ -713,7 +727,7 @@
 "Peki ad neden önemli? <span class=\"anchor-reference-id\">(<a 
href=\"#whycare"
 "\">#whycare</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Although the developers of Linux, the kernel, are contributing to the free "
 "software community, many of them do not care about freedom.  People who "
@@ -727,7 +741,7 @@
 "topluluğumuzun tarihinde oynamadıkları bir rol atfetmeye meylediyorlar. "
 "Sonuçta da bu geliştiricilerin görüşlerine haddinden fazla itibar 
ediyorlar."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Calling the system GNU/Linux recognizes the role that our idealism played in "
 "building our community, and <a href=\"/gnu/why-gnu-linux.html\">helps the "
@@ -738,7 +752,7 @@
 "linux.html\">bu ideallerin pratik öneminin insanlar tarafından 
kavranmasına "
 "yardımcı olur</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the real relationship between GNU and Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#what\">#what</a>)</span>"
@@ -746,7 +760,7 @@
 "GNU ve Linux arasındaki gerçek ilişki nedir? <span 
class=\"anchor-reference-"
 "id\">(<a href=\"#what\">#what</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU operating system and the Linux kernel are separate software projects "
 "that do complementary jobs.  Typically they are packaged in a <a href=\"/"
@@ -756,7 +770,7 @@
 "projeleridir. Genellikle bir <a href=\"/distros/distros.html\">GNU/Linux</a> "
 "dağıtımında paketlenir ve birlikte kullanılır."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How did it come about that most people call the system &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
@@ -766,7 +780,7 @@
 "yeğledi? <span class=\"anchor-reference-id\">(<a href=\"#howerror"
 "\">#howerror</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; is a confusion that has spread faster "
 "than the corrective information."
@@ -774,7 +788,7 @@
 "Sistemin &ldquo;Linux&rdquo; olarak adlandırılması, muğlaklığın 
düzeltici "
 "bilgiye kıyasla daha hızlı yayılmasına bir örnektir."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who combined Linux with the GNU system were not aware that that's "
 "what their activity amounted to.  They focused their attention on the piece "
@@ -793,7 +807,7 @@
 "değiştirmelerini istemeye başlamamız birkaç yılımızı aldı. O zamana 
kadar da "
 "bu kargaşa iyiden iyiye yayılmıştı."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the people who call the system &ldquo;Linux&rdquo; have never heard "
 "why that's not the right thing.  They saw others using that name and assume "
@@ -812,7 +826,7 @@
 "başlatıldığına inanıyorlar. Bu yanlış intiba, sistemin 
&ldquo;Linux&rdquo; "
 "olarak adlandırılması gerektiği düşüncesini de pekiştiriyor."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Many of the questions in this file represent people's attempts to justify "
 "the name they are accustomed to using."
@@ -820,7 +834,7 @@
 "Bu dosyadaki soruların çoğu, insanların alışkın oldukları adı 
kullanmalarını "
 "haklı çıkarma girişimlerine işaret eder."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we always say &ldquo;GNU/Linux&rdquo; instead of &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
@@ -829,7 +843,7 @@
 "kullanmalıyız? <span class=\"anchor-reference-id\">(<a href=\"#always"
 "\">#always</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not always&mdash;only when you're talking about the whole system.  When "
 "you're referring specifically to the kernel, you should call it &ldquo;"
@@ -839,7 +853,7 @@
 "çekirdekten söz ediyorsanız, geliştiricisinin seçtiği 
&ldquo;Linux&rdquo; "
 "adını kullanabilirsiniz."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
 "call the whole system by the same name as the kernel.  This causes many "
@@ -855,7 +869,7 @@
 "uzmanlar anlayabilir. Tüm sistemi &ldquo;GNU/Linux&rdquo;, çekirdeği de "
 "&ldquo;Linux&rdquo; olarak adlandırarak, anlam karmaşasını önlemiş 
olursunuz."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Would Linux have achieved the same success if there had been no GNU? <span "
 "class=\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</"
@@ -865,7 +879,7 @@
 "miydi? <span class=\"anchor-reference-id\">(<a href=\"#linuxalone"
 "\">#linuxalone</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In that alternative world, there would be nothing today like the GNU/Linux "
 "system, and probably no free operating system at all.  No one attempted to "
@@ -879,7 +893,7 @@
 "geliştirmeye kalkışmadı. (ki Berkeley CSRG'yi kodlarını 
özgürleştirmeye "
 "davet eden de özel olarak GNU Projesi olmuştur)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds was partly influenced by a speech about GNU in Finland in "
 "1990.  It's possible that even without this influence he might have written "
@@ -893,7 +907,7 @@
 "Linux, 1992 yılında Linus onu GNU GPL altında yeniden yayımlayınca 
özgür "
 "hale geldi. (0.12 versiyonunun sürüm notlarına bakınız.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Even if Torvalds had released Linux under some other free software license, "
 "a free kernel alone would not have made much difference to the world.  The "
@@ -906,7 +920,7 @@
 "olan GNU/Linux gibi daha geniş bir çatıyla bütünleşmesinden ileri "
 "gelmektedir."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better for the community if you did not divide people with "
 "this request? <span class=\"anchor-reference-id\">(<a href=\"#divide"
@@ -915,7 +929,7 @@
 "Topluluğu böyle bir istekle bölmeseniz topluluk için daha iyi olmaz 
mıydı? "
 "<span class=\"anchor-reference-id\">(<a href=\"#divide\">#divide</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
 "people.  We are asking them to give the GNU Project credit for the GNU "
@@ -926,7 +940,7 @@
 "takdir etmesini istiyoruz. Bu herhangi bir kimseyi eleştirmek veya 
dışlamak "
 "demek değildir."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, there are people who do not like our saying this.  Sometimes those "
 "people push us away in response.  On occasion they are so rude that one "
@@ -941,7 +955,7 @@
 "topluluğu bölebilir. Dolayısıyla umarız onları tavırlarından 
vazgeçmeye ikna "
 "edebilirsiniz."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, this is only a secondary cause of division in our community.  The "
 "largest division in the community is between people who appreciate free "
@@ -957,7 +971,7 @@
 "yararlardan söz edip özgür yazılımı yalnızca verimli bir geliştirme 
modeli "
 "olarak sunanlar (açık kaynak hareketi) arasındadır."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This disagreement is not just a matter of names&mdash;it is a matter of "
 "differing basic values.  It is essential for the community to see and think "
@@ -973,7 +987,7 @@
 "open-source-misses-the-point.html\">Açık Kaynak, Özgür Yazılım Ruhunu 
Neden "
 "Iskalıyor?</a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The disagreement over values partially aligns with the amount of attention "
 "people pay to the GNU Project's role in our community.  People who value "
@@ -999,7 +1013,7 @@
 "olmayacaktır) ya da tamamen bozguna uğrarsak (böyle olmamasını ümit 
edelim) "
 "ortadan kalkacaktır."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Doesn't the GNU project support an individual's free speech rights to call "
 "the system by any name that individual chooses? <span class=\"anchor-"
@@ -1009,7 +1023,7 @@
 "verebilme konusunda ifade özgürlüğünü desteklemiyor mu? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#freespeech\">#freespeech</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Yes, indeed, we believe you have a free speech right to call the operating "
 "system by any name you wish.  We ask that people call it GNU/Linux as a "
@@ -1023,7 +1037,7 @@
 "GNU’nun dayandığı özgürlük değerlerini yaymak ve sistemi var edenin 
o "
 "özgürlük değerleri olduğundan başkalarını haberdar etmek için 
istiyoruz."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since everyone knows the role of GNU in developing the system, doesn't the "
 "&ldquo;GNU/&rdquo; in the name go without saying? <span class=\"anchor-"
@@ -1033,7 +1047,7 @@
 "&rdquo; söylemeden geçilmiyor mu? <span class=\"anchor-reference-id\">(<a "
 "href=\"#everyoneknows\">#everyoneknows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Experience shows that the system's users, and the computer-using public in "
 "general, often know nothing about the GNU system.  Most articles about the "
@@ -1048,7 +1062,7 @@
 "gnu.html\">GNU'yu Hiç Duymamış GNU Kullanıcıları</a> makalesinde bu 
durum "
 "ayrıntılı olarak açıklanmaktadır."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who say this are probably geeks thinking of the geeks they know.  "
 "Geeks often do know about GNU, but many have a completely wrong idea of what "
@@ -1062,7 +1076,7 @@
 "\">&ldquo;araçlar&rdquo;</a> bütünü veya araç geliştirmeye yarayan bir 
proje "
 "zanneder."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The wording of this question, which is typical, illustrates another common "
 "misconception.  To speak of &ldquo;GNU's role&rdquo; in developing something "
@@ -1076,7 +1090,7 @@
 "işletim sistemidir. Bu veya başka bir faaliyette GNU'nun değil, ama GNU "
 "Projesi'nin rolünden söz etmek mantıklı olabilir."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since I know the role of GNU in this system, why does it matter what name I "
 "use? <span class=\"anchor-reference-id\">(<a href="
@@ -1086,7 +1100,7 @@
 "önemi var? <span class=\"anchor-reference-id\">(<a href="
 "\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your words don't reflect your knowledge, you don't teach others.  Most "
 "people who have heard of the GNU/Linux system think it is &ldquo;"
@@ -1099,7 +1113,7 @@
 "ve bu sistemin &ldquo;açık kaynaklı&rdquo; olarak tasarlandığını "
 "zannediyorlar. Eğer doğrusunu onlara siz söylemezseniz kim söyleyecek?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't shortening &ldquo;GNU/Linux&rdquo; to &ldquo;Linux&rdquo; just like "
 "shortening &ldquo;Microsoft Windows&rdquo; to &ldquo;Windows&rdquo;? <span "
@@ -1110,7 +1124,7 @@
 "midir? <span class=\"anchor-reference-id\">(<a href=\"#windows\">#windows</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It's useful to shorten a frequently-used name, but not if the abbreviation "
 "is misleading."
@@ -1118,7 +1132,7 @@
 "Sık kullanılan bir adı kısaltmak, eğer kısaltma yanıltıcı değilse, "
 "kullanışlıdır."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Almost everyone in developed countries really does know that the &ldquo;"
 "Windows&rdquo; system is made by Microsoft, so shortening &ldquo;Microsoft "
@@ -1133,7 +1147,7 @@
 "&ldquo;Linux&rdquo; olarak kısaltmak ise, sistemin nereden geldiği 
konusunda "
 "yanlış bir fikir verir."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The question is itself misleading because GNU and Microsoft are not the same "
 "kind of thing.  Microsoft is a company; GNU is an operating system."
@@ -1141,7 +1155,7 @@
 "Esasında sorunun kendisi de yanıltıcı, çünkü GNU ve Microsoft aynı 
şeyler "
 "değildir. Microsoft bir şirket, GNU ise bir işletim sistemidir."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't GNU a collection of programming tools that were included in Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
@@ -1149,7 +1163,7 @@
 "GNU, Linux içinde yer alan bir dizi programlama aracı değil midir? <span "
 "class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "People who think that Linux is an entire operating system, if they hear "
 "about GNU at all, often get a wrong idea of what GNU is.  They may think "
@@ -1168,7 +1182,7 @@
 "Linux&rdquo; olarak etiketlendirilmiş bir işletim sistemi içinde kavramsal 
"
 "bir yapıya oturtmak zordur."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Project was named after the GNU operating system&mdash;it's the "
 "project to develop the GNU system.  (See <a href=\"/gnu/initial-announcement."
@@ -1178,7 +1192,7 @@
 "sistemini geliştirmek için kullanılan projedir. (Bkz. <a 
href=\"/gnu/initial-"
 "announcement.html\">1983 tarihli ilk duyuru</a>.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We developed programs such as GCC, GNU Emacs, GAS, GLIBC, BASH, etc., "
 "because we needed them for the GNU operating system.  GCC, the GNU Compiler "
@@ -1192,7 +1206,7 @@
 "Projesi'nde çalışan pek çok insan, GNU sistemi için Ghostscript, 
GNUCash, "
 "GNU Chess ve GNOME'yi de geliştirdik."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the difference between an operating system and a kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
@@ -1200,7 +1214,7 @@
 "Bir işletim sistemi ile bir çekirdek arasındaki fark nedir? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "An operating system, as we use the term, means a collection of programs that "
 "are sufficient to use the computer to do a wide variety of jobs.  A general "
@@ -1213,7 +1227,7 @@
 "olabilmesi için, bu sistemin birçok kullanıcının yapmayı 
isteyebileceği "
 "bütün işleri kotarabilmesi gerekir."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The kernel is one of the programs in an operating system&mdash;the program "
 "that allocates the machine's resources to the other programs that are "
@@ -1223,7 +1237,7 @@
 "kaynaklarını, çalışan diğer programlara tahsis eden bir program). 
Çekirdek, "
 "aynı zamanda öteki programları başlatma ve durdurma işini de yürütür."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "To confuse matters, some people use the term &ldquo;operating system&rdquo; "
 "to mean &ldquo;kernel&rdquo;.  Both uses of the term go back many years.  "
@@ -1245,7 +1259,7 @@
 "sistemi olmasını tasarladığımız için, “işletim sistemi” terimini 
biz de aynı "
 "şekilde kullanıyoruz."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the time when people speak of the &ldquo;Linux operating "
 "system&rdquo; they are using &ldquo;operating system&rdquo; in the same "
@@ -1264,7 +1278,7 @@
 "ilişkin anlam karmaşasını gidermek için de lütfen 
&ldquo;çekirdek&rdquo; "
 "kelimesini kullanınız."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
@@ -1276,7 +1290,7 @@
 "sakıncası yok. Sonrasında ise, GNU/Linux sistem dağıtımlarından söz 
etmek "
 "gerekiyor."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The kernel of a system is like the foundation of a house.  How can a house "
 "be almost complete when it doesn't have a foundation? <span class=\"anchor-"
@@ -1286,7 +1300,7 @@
 "olur da tam gözüyle bakabiliriz? <span class=\"anchor-reference-id\">(<a "
 "href=\"#house\">#house</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "A kernel is not much like the foundation of a house because building an "
 "operating system is not much like building a house."
@@ -1294,7 +1308,7 @@
 "Çekirdek bir evin temeli gibi değildir aslında, çünkü bir işletim 
sistemi "
 "meydana getirmek bir ev inşa etmek gibi değildir."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A house is built from lots of little general parts that are cut and put "
 "together in situ.  They have to be put together from the bottom up.  Thus, "
@@ -1306,7 +1320,7 @@
 "Dolayısıyla, temel inşa edilmeden önemli parçalar da inşa edilemez. 
Böyle "
 "bir durumda sahip olduğunuz tek şey toprakta bir delikten ibaret 
olacaktır."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "By contrast, an operating system consists of complex components that can be "
 "developed in any order.  When you have developed most of the components, "
@@ -1323,7 +1337,7 @@
 "yörüngede ancak tek bir olmazsa olmaz modül bekleniyorsa, bu tablo 1992 "
 "yılında GNU sisteminin içinde bulunduğu duruma benzetilebilir."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't the kernel the brain of the system? <span class=\"anchor-reference-id"
 "\">(<a href=\"#brain\">#brain</a>)</span>"
@@ -1331,7 +1345,7 @@
 "Çekirdek sistemin beyni değil midir? <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#brain\">#brain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A computer system is not much like a human body, and no part of it plays a "
 "role comparable to that of the brain in a human."
@@ -1339,7 +1353,7 @@
 "Bir bilgisayar sistemi tam olarak bir insan bedeni gibi değildir ve hiçbir "
 "parçası insan beyniyle kıyaslanabilecek bir rol oynamaz."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't writing the kernel most of the work in an operating system? <span "
 "class=\"anchor-reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</"
@@ -1349,11 +1363,11 @@
 "class=\"anchor-reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "No, many components take a lot of work."
 msgstr "Hayır, birçok bileşen çok fazla iş gerektirmektedir."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "An operating system requires a kernel.  Since the GNU Project didn't develop "
 "a kernel, how can the system be GNU?<span class=\"anchor-reference-id\">(<a "
@@ -1363,7 +1377,7 @@
 "geliştirmediğine göre, sistem nasıl GNU oluyor?<span class=\"anchor-"
 "reference-id\">(<a href=\"#nokernel\">#nokernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The people who argue that way for calling the system &ldquo;Linux&rdquo; are "
 "using a double standard.  An operating system requires compilers, editors, "
@@ -1378,7 +1392,7 @@
 "ihtiyacı var. Torvalds bunların herhangi birini geliştirmediğine göre, "
 "sistem nasıl &ldquo;Linux&rdquo; olacak?"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "That standard is too strict, not the right way to judge the contributions of "
 "any contributor."
@@ -1386,7 +1400,7 @@
 "Bu standart çok sıkı ve herhangi bir katkı sağlayan kişinin 
katkılarını "
 "yargılamanın doğru yolu değil."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds made an important contribution to the operating system we "
 "use; the GNU Project started earlier and contributed much more.  The name "
@@ -1396,7 +1410,7 @@
 "Projesi daha önce başladı ve çok daha fazlasını sağladı. &ldquo;GNU/"
 "Linux&rdquo; ismi her birine itibarını sunuyor."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How can GNU be an operating system, if I can't get something called &ldquo;"
 "GNU&rdquo; and install it? <span class=\"anchor-reference-id\">(<a href="
@@ -1406,7 +1420,7 @@
 "işletim sistemi olabilir? <span class=\"anchor-reference-id\">(<a href="
 "\"#notinstallable\">#notinstallable</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Many <a href=\"/distros/distros.html\"> packaged and installable versions of "
 "GNU</a> are available.  None of them is called simply &ldquo;GNU&rdquo;, but "
@@ -1416,7 +1430,7 @@
 "versiyonlarının</a> çoğu mevcuttur. Bunların hiçbirine basitçe GNU 
denmiyor "
 "ancak GNU temelde oldukları şey."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We expected to release the GNU system packaged for installation, but this "
 "plan was overtaken by events: in 1992 others were already packaging GNU "
@@ -1436,7 +1450,7 @@
 "henüz hazır olmayan GNU Hurd çekirdeğine sahip bir sistem versiyonunun "
 "adıydı."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Hurd kernel never became sufficiently ready; we only recommend it to "
 "those interested in working on it.  So we never packaged GNU with the GNU "
@@ -1447,7 +1461,7 @@
 "Hurd çekirdeğiyle paketlememiştik. Ancak Debian bu kombinasyonu Debian 
GNU/"
 "Hurd olarak paketledi."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are now developing an advanced Scheme-based package manager called Guix "
 "and a complete system distribution based on it called the <a href=\"/"
@@ -1459,7 +1473,7 @@
 "tam bir sistem dağıtımı geliştiriyoruz. Bu, GNU sisteminin önemli bir "
 "bölümünün yeniden paketlenmesini içerir."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We never took the last step of packaging GNU under the name &ldquo;"
 "GNU&rdquo;, but that doesn't alter what kind of thing GNU is.  GNU is an "
@@ -1469,7 +1483,7 @@
 "bu, GNU'nun ne tür bir şey olduğunu değiştirmiyor. GNU bir işletim "
 "sistemidir."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "We're calling the whole system after the kernel, Linux.  Isn't it normal to "
 "name an operating system after a kernel? <span class=\"anchor-reference-id\">"
@@ -1479,7 +1493,7 @@
 "sistemine çekirdeğin adını vermek normal değil midir? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "That practice seems to be very rare&mdash;we can't find any examples other "
 "than the misuse of the name &ldquo;Linux&rdquo;.  Normally an operating "
@@ -1495,7 +1509,7 @@
 "ayrı bir ismi olmaz. İnsanlar &ldquo;filancanın çekirdeği&rdquo; veya 
&ldquo;"
 "filanca çekirdeği&rdquo; derler."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Because those two constructions are used synonymously, the expression &ldquo;"
 "the Linux kernel&rdquo; can easily be misunderstood as meaning &ldquo;the "
@@ -1510,7 +1524,7 @@
 "&ldquo;çekirdek, Linux&rdquo; veya &ldquo;Linux (çekirdek)&rdquo; 
biçiminde "
 "söyleyip yazabilirsiniz."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can another system have &ldquo;the feel of Linux&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
@@ -1518,7 +1532,7 @@
 "Başka bir sistem &ldquo;Linux hissine&rdquo; sahip olabilir mi? <span class="
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is no such thing as the &ldquo;feel of Linux&rdquo; because Linux has "
 "no user interfaces.  Like any modern kernel, Linux is a base for running "
@@ -1532,7 +1546,7 @@
 "Linux ile insan etkileşimi her zaman diğer programlardan geçer ve bu his "
 "onlardan gelir."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  How about "
 "recommending a shorter name? <span class=\"anchor-reference-id\">(<a href="
@@ -1542,7 +1556,7 @@
 "bir isim önerseniz nasıl olur? <span class=\"anchor-reference-id\">(<a 
href="
 "\"#long\">#long</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "For a while we tried the name &ldquo;LiGNUx&rdquo;, which combines the words "
 "&ldquo;GNU&rdquo; and &ldquo;Linux&rdquo;.  The reaction was very bad.  "
@@ -1552,7 +1566,7 @@
 "olan &ldquo;LiGNUx&rdquo; adını denedik. Tepkiler çok olumsuzdu. 
Ä°nsanlar, "
 "&ldquo;GNU/Linux&rdquo;u daha çok benimsediler."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
 "call it &ldquo;GNU/Linux&rdquo; <a href=\"#justgnu\"> for the reasons given "
@@ -1562,7 +1576,7 @@
 "\"> aşağıda belirttiğimiz nedenlerden</a> dolayı onu 
&ldquo;GNU/Linux&rdquo; "
 "olarak adlandırdık."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How about calling the system &ldquo;GliNUx&rdquo; (instead of &ldquo;GNU/"
 "Linux&rdquo;)? <span class=\"anchor-reference-id\">(<a href="
@@ -1572,7 +1586,7 @@
 "adlandırmaya ne dersiniz? <span class=\"anchor-reference-id\">(<a href="
 "\"#long1\">#long1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The name &ldquo;GNU&rdquo; does not visibly appear in &ldquo;Glinux,&rdquo; "
 "so most people would not notice it is there.  Even if it is capitalized as "
@@ -1583,7 +1597,7 @@
 "çoğu insan orada olduğunu farketmezdi. &ldquo;GliNUx&rdquo; olarak büyük 
"
 "harfle yazılsa bile çoğu insan GNU'ya referans içerdiğini farketmezdi."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be comparable to writing &ldquo;GNU/Linux,&rdquo; but putting "
 "&ldquo;GNU/&rdquo; in print so small that most people could not read it."
@@ -1591,7 +1605,7 @@
 "&ldquo;GNU/Linux&rdquo; yazmakla karşılaştırılabilir ancak &ldquo;GNU/"
 "&rdquo; 'yu baskıya koymak o kadar küçük ki çoğu insan okuyamıyordu."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  Why should "
 "I go to the trouble of saying &ldquo;GNU/&rdquo;? <span class=\"anchor-"
@@ -1601,7 +1615,7 @@
 "GNU/&rdquo; deme zahmetine girmeliyim? <span class=\"anchor-reference-id\">"
 "(<a href=\"#long2\">#long2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
 "the system that we developed, can't you take one second to recognize our "
@@ -1611,7 +1625,7 @@
 "Geliştirdiğimiz sistemi takdir ederseniz çalışmamızı tanıtmak için 
bir "
 "saniye bile ayıramaz mısınız?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Unfortunately, &ldquo;GNU/Linux&rdquo; is five syllables. People won't use "
 "such a long term. Shouldn't you find a shorter one? <span class=\"anchor-"
@@ -1621,7 +1635,7 @@
 "bir terim kullanmayacak. Daha kısa bir tane bulamaz mısın? <span class="
 "\"anchor-reference-id\">(<a href=\"#long3\">#long3</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, &ldquo;GNU/Linux&rdquo; is only four syllables.  &ldquo;"
 "Unfortunately&rdquo; is five syllables, yet people show no sign of "
@@ -1631,7 +1645,7 @@
 "ki&rdquo; beş heceli ancak insanlar bu kelimeyi kullanmak için isteksizlik "
 "belirtisi göstermiyor."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Stallman doesn't ask us to call him &ldquo;Richard Matthew Stallman&rdquo; "
 "every the time.  So why ask us to say &ldquo;GNU/Linux&rdquo; every time? "
@@ -1642,7 +1656,7 @@
 "demeliyiz? <span class=\"anchor-reference-id\">(<a href=\"#long4\">#uzun4</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Omitting &ldquo;Matthew&rdquo; does not misrepresent anything important "
 "about Stallman's nature, origin, ideas or purpose.  Omitting &ldquo;"
@@ -1652,7 +1666,7 @@
 "amacı hakkında hiç bir şeyi yanlış sunmayacaktır. &ldquo;GNU&rdquo; 
terimini "
 "kullanmamak ise GNU/Linux sistemi hakkındaki şeyleri yanlış 
tanıtacaktır."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is an example of a frequent way of hiding a fallacy: to bury it inside "
 "a misleading analogy.  A better analogy would be, &ldquo;Why shouldn't we "
@@ -1662,7 +1676,7 @@
 "içerisine gömme. Daha iyi bir benzetme &ldquo;Neden Stallman'ı &lsquo;"
 "Torvalds&rsquo; olarak çağırmıyoruz?&rdquo; olacaktır."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since Linux is a secondary contribution, would it be false to the facts to "
 "call the system simply &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id"
@@ -1672,7 +1686,7 @@
 "diye adlandırmak gerçeğe aykırı mı olurdu? <span 
class=\"anchor-reference-id"
 "\">(<a href=\"#justgnu\">#justgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would not be false to the facts, but it is not the best thing to do.  "
 "Here are the reasons we call that system version &ldquo;GNU/Linux&rdquo; "
@@ -1682,7 +1696,7 @@
 "yalnızca &ldquo;GNU&rdquo; demektense &ldquo;GNU/Linux&rdquo; dememizin "
 "nedenleri şunlardır:"
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It's not exactly GNU&mdash;it has a different kernel (that is, Linux).  "
 "Distinguishing GNU/Linux from GNU is useful."
@@ -1690,7 +1704,7 @@
 "Sistem tamamen GNU değildir; farklı bir çekirdeği vardır (Linux). 
GNU/Linux "
 "ile GNU'yu ayırt etmek yararlıdır."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It would be ungentlemanly to ask people to <em>stop</em> giving any credit "
 "to Linus Torvalds.  He did write an important component of the system.  We "
@@ -1710,7 +1724,7 @@
 "görüşlerini paylaşmıyoruz, sisteme verdiği emeği inkar etmek yerine, 
bu "
 "düşünce ayrılığını açık ve onurlu bir biçimde ele alıyoruz."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
 "&ldquo;GNU&rdquo; they may simply not recognize we're talking about the same "
@@ -1722,7 +1736,7 @@
 "eğer &ldquo;GNU/Linux&rdquo; dersek, kulaklarına çalınan bilgi ile bunun "
 "arasında bağlantı kurabilirler."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "I would have to pay a fee if I use &ldquo;Linux&rdquo; in the name of a "
 "product, and that would also apply if I say &ldquo;GNU/Linux&rdquo;.  Is it "
@@ -1737,7 +1751,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There's nothing wrong in calling the system &ldquo;GNU&rdquo;; basically, "
 "that's what it is.  It is nice to give Linus Torvalds a share of the credit "
@@ -1748,7 +1762,7 @@
 "hakkını vermek hoş olacaktır, fakat bu ayrıcalığı verdiğiniz için 
herhangi "
 "bir ödeme yapma zorunluluğunuz yoktur."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "So if you want to refer to the system simply as &ldquo;GNU&rdquo;, to avoid "
 "paying the fee for calling it &ldquo;Linux&rdquo;, we won't criticize you."
@@ -1757,7 +1771,7 @@
 "karşılığında bir ücret ödemekten kurtulmak için sistemi sadece 
&ldquo;"
 "GNU&rdquo; olarak adlandırmak isterseniz sizi tenkit etmeyiz."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today; it includes "
 "TeX, X11, Apache, Perl, and many more programs.  Don't your arguments imply "
@@ -1771,7 +1785,7 @@
 "bizi anlamsız derecede uzun bir ada götürür.) <span 
class=\"anchor-reference-"
 "id\">(<a href=\"#many\">#many</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "What we say is that you ought to give the system's principal developer a "
 "share of the credit.  The principal developer is the GNU Project, and the "
@@ -1781,7 +1795,7 @@
 "gerektiğidir. Başlıca geliştirici GNU Projesidir ve sistem de temelde "
 "GNU'dur."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you feel even more strongly about giving credit where it is due, you "
 "might feel that some secondary contributors also deserve credit in the "
@@ -1798,7 +1812,7 @@
 "konusunda yakındığını düşünüyorsanız ve canınız GNU/Linux/Perl 
yazmak "
 "istiyorsa, buyurun yazın."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Since a long name such as GNU/X11/Apache/Linux/TeX/Perl/Python/FreeCiv "
 "becomes absurd, at some point you will have to set a threshold and omit the "
@@ -1812,7 +1826,7 @@
 "çizileceği konusunda belirgin bir tek nokta yoktur, bu yüzden sınırı 
nereden "
 "çizmek isterseniz isteyin, biz buna karşı çıkmayacağız."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Different threshold levels would lead to different choices of name for the "
 "system.  But one name that cannot result from concerns of fairness and "
@@ -1826,7 +1840,7 @@
 "Linux&rdquo;'tur. Başlıca katkıyı (GNU) es geçip, bütün payı ikincil 
katkıya "
 "(Linux) vermek adil olamaz."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "systemd plays an important role in the GNU/Linux system as it is today; are "
 "we obligated to call it GNU/systemd/Linux? <span class=\"anchor-reference-id"
@@ -1836,7 +1850,7 @@
 "oynamaktadır; onu GNU/systemd/Linux olarak adlandırmak zorunda mıyız? 
<span "
 "class=\"anchor-reference-id\">(<a href=\"#others\">#others</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "systemd is a fairly important component, but not as important as the kernel "
 "(Linux), nor as important as the basis of the system as a whole (GNU).  "
@@ -1848,7 +1862,7 @@
 "sistemi &ldquo;GNU/systemd/Linux&rdquo; olarak adlandırarak systemd'in "
 "varlığını vurgulamak isterseniz bunu yapmakta yanlış hiçbir şey 
yoktur."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today, but they don't "
 "insist on calling it XYZ/Linux.  Why should we treat GNU specially? <span "
@@ -1859,7 +1873,7 @@
 "Neden GNU'ya ayrıcalık tanıyalım? <span class=\"anchor-reference-id\">(<a 
"
 "href=\"#others\">#others</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Thousands of projects have developed programs commonly included in today's "
 "GNU/Linux systems.  They all deserve credit for their contributions, but "
@@ -1871,7 +1885,7 @@
 "etmişlerdir, fakat sistemin başlıca geliştiricileri olmadıkları için 
bizim "
 "bahsettiğimiz şekilde isimlerinin anılmasını talep etmiyorlar."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is different because it is more than just a contributed program, more "
 "than just a collection of contributed programs.  GNU is the framework on "
@@ -1881,7 +1895,7 @@
 "olarak sunulmuş bir programlar bütünü olmaktan da ötedir. GNU, sistemin "
 "üzerine inşa edildiği iskelettir."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "GNU is a small fraction of the system nowadays, so why should we mention it? "
 "<span class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</"
@@ -1891,7 +1905,7 @@
 "neden onun adını analım? <span class=\"anchor-reference-id\">(<a href="
 "\"#allsmall\">#allsmall</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In 2008, we found that GNU packages made up 15% of the &ldquo;main&rdquo; "
 "repository of the gNewSense GNU/Linux distribution.  Linux made up 1.5%.  So "
@@ -1903,7 +1917,7 @@
 "oluşturuyordu. Dolayısıyla aynı sav, üstelik daha bariz bir biçimde, 
sistemi "
 "&ldquo;Linux&rdquo; olarak adlandırmak konusunda da geçerlidir."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is a small fraction of the system nowadays, and Linux is an even smaller "
 "fraction.  But they are the system's core; the system was made by combining "
@@ -1914,7 +1928,7 @@
 "özüdür. Sistem bu ikisinin birleşimiyle ortaya çıkmıştır. 
Dolayısıyla &ldquo;"
 "GNU/Linux&rdquo; ifadesi hâlâ geçerli görünmektedir."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many companies contributed to the system as it is today; doesn't that mean "
 "we ought to call it GNU/Red&nbsp;Hat/Novell/Linux? <span class=\"anchor-"
@@ -1925,7 +1939,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#manycompanies"
 "\">#manycompanies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is not comparable to Red Hat or Novell; it is not a company, or an "
 "organization, or even an activity.  GNU is an operating system.  (When we "
@@ -1939,7 +1953,7 @@
 "projeye işaret ediyoruz.) GNU/Linux sistemi GNU tabanlıdır, bu da GNU'nun "
 "neden sistemin adında yer alması gerektiğini açıklar."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Much of those companies' contribution to the GNU/Linux system lies in the "
 "code they have contributed to various GNU packages including GCC and GNOME.  "
@@ -1951,7 +1965,7 @@
 "adını kullandığınızda, bu şirketlerle birlikte, geri kalan bütün GNU 
"
 "geliştiricilerinin de emeğini takdir etmiş olursunuz."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
@@ -1961,7 +1975,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean "
@@ -1973,7 +1987,7 @@
 "GNU'nun Linux sürümü&rdquo; ya da &ldquo;bir GNU paketi olan Linux&rdquo; "
 "anlamına gelebilir. Bu anlamlardan hiç biri mevcut duruma uygun değildir."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is not a GNU package; that is, it wasn't developed under the GNU "
 "Project's aegis or contributed specifically to the GNU Project.  Linus "
@@ -1985,14 +1999,24 @@
 "Torvalds, Linux'u kendine ait bağımsız bir proje olarak yazdı. 
Dolayısıyla "
 "&ldquo;bir GNU paketi olan Linux&rdquo; anlamı doğru değildir."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "We're not talking about a distinct GNU version of Linux, the kernel.  The "
+#| "free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/";
+#| "project/linux\">separate version of Linux</a>, since the &ldquo;"
+#| "standard&rdquo; version contains non-free firmware &ldquo;blobs&rdquo;.  "
+#| "If this were part of the GNU Project, it could be considered &ldquo;GNU "
+#| "Linux&rdquo;; but we would not want to call it that, because it would be "
+#| "too confusing."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
-"free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/project/";
-"linux\">separate version of Linux</a>, since the &ldquo;standard&rdquo; "
-"version contains non-free firmware &ldquo;blobs&rdquo;.  If this were part "
-"of the GNU Project, it could be considered &ldquo;GNU Linux&rdquo;; but we "
-"would not want to call it that, because it would be too confusing."
+"free GNU/Linux distros do have a <a href=\"https://directory.fsf.org/wiki/";
+"Linux-libre\">separate version of Linux</a>, since the &ldquo;"
+"standard&rdquo; version contains nonfree firmware &ldquo;blobs&rdquo;.  If "
+"this were part of the GNU Project, it could be considered &ldquo;GNU "
+"Linux&rdquo;; but we would not want to call it that, because it would be too "
+"confusing."
 msgstr ""
 "Linux'un (çekirdek) farklı bir GNU sürümünden bahsetmiyoruz. Özgür 
GNU/Linux "
 "dağıtımları, <a href=\"http://directory.fsf.org/project/linux\";>Linux'un "
@@ -2002,7 +2026,7 @@
 "Linux&rdquo; ifadesi doğru olabilirdi, ancak biz bu ifadeyi kullanmak "
 "istemezdik, çünkü epey kafa karıştırıcı olurdu."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We're talking about a version of GNU, the operating system, distinguished by "
 "having Linux as the kernel.  A slash fits the situation because it means "
@@ -2015,7 +2039,7 @@
 "Çıktı&rdquo; ifadesinde olduğu gibi...). Bu sistem GNU ile Linux'un "
 "birleşimidir. Dolayısıyla adı &ldquo;GNU/Linux&rdquo;'tur."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are other ways to express &ldquo;combination&rdquo;.  If you think "
 "that a plus-sign is clearer, please use that.  In French, a hyphen is clear: "
@@ -2027,7 +2051,7 @@
 "Fransızca'da tire işareti daha açıktır: &ldquo;GNU-Linux&rdquo;… "
 "Ä°spanyolca'da ise bazen &ldquo;GNU con Linux&rdquo; deriz."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How is the name &ldquo;GNU/Linux&rdquo; pronounced? <span class=\"anchor-"
 "reference-id\">(<a href=\"#pronounce\">#pronounce</a>)</span>"
@@ -2035,7 +2059,7 @@
 "&ldquo;GNU/Linux&rdquo; ismi nasıl telafuz ediliyor? <span class=\"anchor-"
 "reference-id\">(<a href=\"#pronounce\">#pronounce</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please pronounce it as &ldquo;GNU slash Linux.&rdquo; If you don't pronounce "
 "the slash, people will think you are saying &ldquo;GNU Linux,&rdquo; which "
@@ -2046,7 +2070,7 @@
 "sanacaktır, buysa <a href=\"#whyslash\">bileşim için uygun bir isim "
 "değildir</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU Emacs&rdquo; rather than &ldquo;GNU/"
 "Emacs&rdquo;? <span class=\"anchor-reference-id\">(<a href=\"#whynoslash"
@@ -2056,7 +2080,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#whynoslash\">#whynoslash</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Emacs&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Emacs&rdquo;.  That is the right "
@@ -2066,7 +2090,7 @@
 "GNU&rdquo; kelimesi &ldquo;Emacs&rdquo; kelimesini niteler. Bu da, bir GNU "
 "paketi olan Emacs adındaki bir programı tanımlar."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;GNU/Emacs&rdquo; would mean the combination of GNU, the operating "
 "system, and the program Emacs.  That doesn't fit this program, so &ldquo;GNU/"
@@ -2076,7 +2100,7 @@
 "birleşimi anlamına gelecektir. Bu program için bu uygun değildir, bu 
nedenle "
 "&ldquo;GNU/Emacs&rdquo; ifadesi onu kastetmek için yanlıştır."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why &ldquo;GNU/Linux&rdquo; rather than &ldquo;Linux/GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
@@ -2084,7 +2108,7 @@
 "Neden &ldquo;Linux/GNU&rdquo; değil de, &ldquo;GNU/Linux&rdquo;? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is right and proper to mention the principal contribution first.  The GNU "
 "contribution to the system is not only bigger than Linux and prior to Linux, "
@@ -2094,7 +2118,7 @@
 "Linux'un katkısından sırf daha büyük ve sırf daha önce değildir, 
aynı "
 "zamanda biz bütün faaliyeti başlatan kişileriz de..."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the lowest "
 "level of the system and GNU fills technically higher levels."
@@ -2103,7 +2127,7 @@
 "olduğu ve GNU'nun teknik olarak daha yüksek seviyeleri doldurduğu 
gerçeğine "
 "uyar."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
 "lot better than what people usually do, which is to omit GNU entirely and "
@@ -2114,7 +2138,7 @@
 "etmelerinden ve sanki bütün sistem Linux'muş gibi göstermelerinden çok 
daha "
 "iyidir."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
 "say anything about what the system consists of.  Why shouldn't they call it "
@@ -2126,7 +2150,7 @@
 "istedikleri gibi adlandırmasınlar ki? <span class=\"anchor-reference-id\">"
 "(<a href=\"#distronames0\">#distronames0</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling a system &ldquo;Foobar Linux&rdquo; implies that it's a flavor of "
 "&ldquo;Linux,&rdquo; and people <a href=\"#distronames\">understand it that "
@@ -2136,7 +2160,7 @@
 "bir türevi olduğunu ve insanların <a href=\"#distronames\">bunu bu 
şekilde "
 "anladığını</a> ima eder."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If they called a GNU/Linux distro &ldquo;Foobar BSD,&rdquo; you would call "
 "that a mistake.  &ldquo;This system is not BSD,&rdquo; you would tell them.  "
@@ -2146,7 +2170,7 @@
 "adlandırırlarsa buna bir hata derdiniz.  &ldquo;Bu sistem BSD 
değil,&rdquo; "
 "onlara söylerdin. Eh, Linux de değil."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro is called &ldquo;Foobar Linux&rdquo;; doesn't that show it's "
 "really Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
@@ -2156,7 +2180,7 @@
 "olduğunu göstermez mi? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames\">#distronames</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It means that the people who make the &ldquo;Foobar Linux&rdquo; distro are "
 "repeating the common mistake. We appreciate that distributions like Debian, "
@@ -2170,7 +2194,7 @@
 "olduklarını takdir ediyoruz ve farklı bir dağıtımla ilgilenirseniz 
aynı şeyi "
 "yapmaya teşvik edeceğinizi umuyoruz."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's official name is &ldquo;Foobar Linux&rdquo;; isn't it wrong to "
 "call the distro anything but &ldquo;Foobar Linux&rdquo;? <span class="
@@ -2181,7 +2205,7 @@
 "mı? <span class=\"anchor-reference-id\">(<a href="
 "\"#distronames1\">#distronames1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When they spread misinformation by changing &ldquo;GNU&rdquo; to &ldquo;"
 "Linux&rdquo;, and call their version of it &ldquo;Foobar Linux&rdquo;, it's "
@@ -2193,7 +2217,7 @@
 "adlandırdıklarında yanlış bilgiyi &ldquo;Falanca GNU/Linux&rdquo; olarak 
"
 "adlandırarak düzeltmeniz uygun olur."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be more effective to ask companies such as Mandrake, Red Hat and "
 "IBM to call their distributions &ldquo;GNU/Linux&rdquo; rather than asking "
@@ -2206,7 +2230,7 @@
 "etkili olmaz mıydı? <span class=\"anchor-reference-id\">(<a 
href=\"#companies"
 "\">#companies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It isn't a choice of one or the other&mdash;we ask companies and "
 "organizations and individuals to help spread the word about this.  In fact, "
@@ -2225,7 +2249,7 @@
 "olarak adlandırarak daha fazla para kazanmayı umuyoruz,&rdquo; demişti. "
 "Başka bir deyişle, bu şirket için neyin doğru olduğunun önemi yok."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We can't make them do this right, but we're not the sort to give up just "
 "because the road isn't easy.  You may not have as much influence at your "
@@ -2239,7 +2263,7 @@
 "gidişatı, şirketlerin sistemi &ldquo;GNU/Linux&rdquo; diye adlandırarak 
daha "
 "fazla kâr edeceği bir noktaya getirebiliriz."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to reserve the name &ldquo;GNU/Linux&rdquo; for "
 "distributions that are purely free software? After all, that is the ideal of "
@@ -2251,15 +2275,26 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#reserve\">#reserve</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+#, fuzzy
+#| msgid ""
+#| "The widespread practice of adding non-free software to the GNU/Linux "
+#| "system is a major problem for our community.  It teaches the users that "
+#| "non-free software is ok, and that using it is part of the spirit of "
+#| "&ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part "
+#| "of their mission to help users use non-free add-ons, and may even invite "
+#| "salesmen to come and make sales pitches for them.  They adopt goals such "
+#| "as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them "
+#| "use non-free applications and drivers), or making the system more popular "
+#| "even at the cost of freedom."
 msgid ""
-"The widespread practice of adding non-free software to the GNU/Linux system "
-"is a major problem for our community.  It teaches the users that non-free "
+"The widespread practice of adding nonfree software to the GNU/Linux system "
+"is a major problem for our community.  It teaches the users that nonfree "
 "software is ok, and that using it is part of the spirit of &ldquo;"
 "Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of their "
-"mission to help users use non-free add-ons, and may even invite salesmen to "
+"mission to help users use nonfree add-ons, and may even invite salesmen to "
 "come and make sales pitches for them.  They adopt goals such as &ldquo;"
-"helping the users&rdquo; of GNU/Linux (including helping them use non-free "
+"helping the users&rdquo; of GNU/Linux (including helping them use nonfree "
 "applications and drivers), or making the system more popular even at the "
 "cost of freedom."
 msgstr ""
@@ -2275,11 +2310,11 @@
 "özgürlüğü feda ederek de olsa sistemi popüler hale getirmeyi amaç "
 "edinmişlerdir."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The question is how to try to change this."
 msgstr "Soru bu durumu nasıl değiştirebilirizdir."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Given that most of the community which uses GNU with Linux already does not "
 "realize that's what it is, for us to disown these adulterated versions, "
@@ -2294,13 +2329,22 @@
 "kastedilen mesajı almayacaklardır. Verecekleri cevap, &ldquo;Biz bu "
 "sistemlerin GNU olduğunu hiç bilmiyorduk ki,&rdquo; olacaktır."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The way to lead these users to see a connection with freedom is exactly "
+#| "the opposite: to inform them that all these system versions <em>are</em> "
+#| "versions of GNU, that they all are based on a system that exists "
+#| "specifically for the sake of the users' freedom.  With this "
+#| "understanding, they can start to recognize the distributions that include "
+#| "non-free software as perverted, adulterated versions of GNU, instead of "
+#| "thinking they are proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgid ""
 "The way to lead these users to see a connection with freedom is exactly the "
 "opposite: to inform them that all these system versions <em>are</em> "
 "versions of GNU, that they all are based on a system that exists "
 "specifically for the sake of the users' freedom.  With this understanding, "
-"they can start to recognize the distributions that include non-free software "
+"they can start to recognize the distributions that include nonfree software "
 "as perverted, adulterated versions of GNU, instead of thinking they are "
 "proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgstr ""
@@ -2313,7 +2357,7 @@
 "sürümü&rdquo; olduğunu düşünmek yerine, bunların bozulmuş, 
saflığını "
 "yitirmiş birer GNU sürümü olduğunu kavrayacaklardır."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is very useful to start GNU/Linux User Groups, which call the system GNU/"
 "Linux and adopt the ideals of the GNU Project as a basis for their "
@@ -2332,7 +2376,7 @@
 "kendi görüşlerini savunmaya hakları vardır, fakat onların sizi de "
 "sürüklemesine izin vermeyin!"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not make a GNU distribution of Linux (sic) and call that GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
@@ -2342,7 +2386,7 @@
 "adlandırmıyorsunuz? <span class=\"anchor-reference-id\">(<a href=\"#gnudist"
 "\">#gnudist</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "All the &ldquo;Linux&rdquo; distributions are actually versions of the GNU "
 "system with Linux as the kernel.  The purpose of the term &ldquo;GNU/"
@@ -2356,7 +2400,7 @@
 "&ldquo;GNU/Linux&rdquo; diye adlandırmak, vurgulamak istediğimiz hususu "
 "bulanıklaştırır."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "As for developing a distribution of GNU/Linux, we already did this once, "
 "when we funded the early development of Debian GNU/Linux.  To do it again "
@@ -2371,7 +2415,7 @@
 "belirgin pratik avantajlar sağlamadığı sürece de hiç bir amaca hizmet "
 "etmeyecektir."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Instead we help the developers of 100% free GNU/Linux distributions, such as "
 "gNewSense and Ututo."
@@ -2379,7 +2423,7 @@
 "Bunun yerine gNewSense ve Ututo gibi %100 özgür GNU/Linux 
dağıtımlarının "
 "geliştiricilerine yardımcı oluyoruz."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not just say &ldquo;Linux is the GNU kernel&rdquo; and release some "
 "existing version of GNU/Linux under the name &ldquo;GNU&rdquo;? <span class="
@@ -2389,7 +2433,7 @@
 "sürümlerinden birini &ldquo;GNU&rdquo; adı altında yayınlamıyorsunuz? 
<span "
 "class=\"anchor-reference-id\">(<a href=\"#linuxgnu\">#linuxgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It might have been a good idea to adopt Linux as the GNU kernel back in "
 "1992.  If we had realized, then, how long it would take to get the GNU Hurd "
@@ -2399,7 +2443,7 @@
 "GNU Hurd'u çalıştırmayı başarmamızın ne kadar süreceğini o zaman 
kavramış "
 "olsaydık, bunu yapabilirdik. (Ah! İşte öngörüsüzlük dedikleri...)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we were to take an existing version of GNU/Linux and relabel it as &ldquo;"
 "GNU&rdquo;, that would be somewhat like making a version of the GNU system "
@@ -2411,7 +2455,7 @@
 "Linux&rdquo; olarak etiketlemek gibi olurdu bu. Böyle bir şey yapmamız 
doğru "
 "olmazdı ve biz de bu şekilde davranmak istemiyoruz."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Did the GNU Project condemn and oppose use of Linux in the early days? <span "
 "class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
@@ -2420,7 +2464,7 @@
 "muydu? <span class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We did not adopt Linux as our kernel, but we didn't condemn or oppose it.  "
 "In 1993 we started discussing the arrangements to sponsor the development of "
@@ -2440,7 +2484,7 @@
 "değişikliklerdi ve taşınabilir özellikte değillerdi; bunların kurulum 
için "
 "temizlenmeleri gerekiyordu."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who had made the changes showed little interest in cooperating "
 "with us.  One of them actually told us that he didn't care about working "
@@ -2459,7 +2503,7 @@
 "temelde GNU tabanlı bir sistem geliştiren bu insanlar, bizimle 
çalışmayı "
 "istemeyen ilk (hâlâ da neredeyse tek) grup oldu."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It was this experience that first showed us that people were calling a "
 "version of the GNU system &ldquo;Linux&rdquo;, and that this confusion was "
@@ -2473,7 +2517,7 @@
 "bu soruna ve “Linux” şeklindeki yanlış adlandırmadan ötürü oluşan 
başka "
 "sorunlara karşı bizim verdiğimiz yanıttır."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why did you wait so long before asking people to use the name GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
@@ -2482,7 +2526,7 @@
 "geciktiniz? <span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually we didn't.  We began talking privately with developers and "
 "distributors about this in 1994, and made a more public campaign in 1996.  "
@@ -2492,7 +2536,7 @@
 "yılında özel görüşmeler yapmaya başladık ve 1996'da daha halka açık 
bir "
 "kampanya yürüttük. Gerekli olduğu sürece de devam edeceğiz."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should the GNU/<i>name</i> convention be applied to all programs that are "
 "GPL'ed? <span class=\"anchor-reference-id\">(<a href=\"#allgpled"
@@ -2502,7 +2546,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#allgpled\">#allgpled</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We never refer to individual programs as &ldquo;GNU/<i>name</i>&rdquo;.  "
 "When a program is a GNU package, we may call it &ldquo;GNU <i>name</"
@@ -2512,7 +2556,7 @@
 "adlandırmayız. Eğer bir program GNU paketi ise onu &ldquo;GNU <i>ad</"
 "i>&rdquo; şeklinde adlandırabiliriz."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU, the operating system, is made up of many different programs.  Some of "
 "the programs in GNU were written as part of the GNU Project or specifically "
@@ -2524,7 +2568,7 @@
 "sisteme katkı olarak sunulmuştur. Bunlar, GNU paketleridir. Biz de "
 "genellikle bunların adında &ldquo;GNU&rdquo; kelimesini kullanırız."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It's up to the developers of a program to decide if they want to contribute "
 "it and make it a GNU package.  If you have developed a program and you would "
@@ -2539,7 +2583,7 @@
 "gnu@gnu.org&gt;</a> adresine yazın. Böylece biz de programı 
değerlendirip, "
 "almak isteyip istemediğimize karar verebiliriz."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It wouldn't be fair to put the name GNU on every individual program that is "
 "released under the GPL.  If you write a program and release it under the "
@@ -2559,7 +2603,7 @@
 "düşen de bir şey yoktur. Dolayısıyla da o programın ismine 
&ldquo;GNU&rdquo; "
 "takısı getirmek uygun olmaz."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In contrast, we do deserve the overall credit for the GNU operating system "
 "as a whole, even though not for each and every program in it.  The system "
@@ -2571,7 +2615,7 @@
 "başlanmadan yıllar önce, 1984'ten itibaren gösterdiğimiz azim ve 
kararlılık "
 "sayesinde sistemin kendisi bir sistem olarak var olabilmiştir."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The operating system in which Linux became popular was basically the same as "
 "the GNU operating system.  It was not entirely the same, because it had a "
@@ -2584,7 +2628,7 @@
 "sistemdi. Bu sistem, GNU'nun bir çeşitlemesi idi. Yani adı GNU/Linux "
 "sistemiydi."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux continues to be used primarily in derivatives of that system&mdash;in "
 "today's versions of the GNU/Linux system.  What gives these systems their "
@@ -2596,7 +2640,7 @@
 "kazandıran bileşenler, bu sistemlerin merkezinde yer alan GNU ve Linux'tur. 
"
 "Tek başına sadece Linux değil."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since much of GNU comes from Unix, shouldn't GNU give credit to Unix by "
 "using &ldquo;Unix&rdquo; in its name? <span class=\"anchor-reference-id\">"
@@ -2606,7 +2650,7 @@
 "kullanarak ona bir pay vermesi gerekiyor mu? <span class=\"anchor-reference-"
 "id\">(<a href=\"#unix\">#unix</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Actually, none of GNU comes from Unix.  Unix was proprietary software (and "
 "still is), so using any of its code in GNU would have been illegal.  This is "
@@ -2624,7 +2668,7 @@
 "programı, hatta bunların parçalarını dahi kopyalamazdık; her şeyin 
baştan "
 "yazılması gerekiyordu."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "No code in GNU comes from Unix, but GNU is a Unix-compatible system; "
 "therefore, many of the ideas and specifications of GNU do come from Unix.  "
@@ -2640,13 +2684,22 @@
 "hacker&rdquo; geleneği olan, kendini tekrar eden isimler türetme "
 "uygulamasına bağlı kalınmıştır."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The first such recursive acronym was TINT, &ldquo;TINT Is Not "
+#| "TECO&rdquo;.  The author of TINT wrote another implementation of TECO "
+#| "(there were already many of them, for various systems), but instead of "
+#| "calling it by a dull name like &ldquo;<em>somethingorother</em> "
+#| "TECO&rdquo;, he thought of a clever amusing name.  (That's what hacking "
+#| "means: <a href=\"http://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
 "The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
 "The author of TINT wrote another implementation of TECO (there were already "
 "many of them, for various systems), but instead of calling it by a dull name "
 "like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of a clever "
-"amusing name.  (That's what hacking means: <a href=\"http://stallman.org/";
+"amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
 "Bu şekilde kendini tekrar eden isimlere ilk örnek TINT idi, (&ldquo;TINT Is 
"
@@ -2657,7 +2710,7 @@
 "in anlamı da budur zaten: <a href=\"http://stallman.org/articles/on-hacking.";
 "html\">oyunbaz bir zeka</a>.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Other hackers enjoyed that name so much that we imitated the approach.  It "
 "became a tradition that, when you were writing from scratch a program that "
@@ -2673,7 +2726,7 @@
 "tekrar eden bir ad verebilirsiniz. Aynı ruhla biz de Unix yerine 
yaptığımız "
 "sistemi &ldquo;GNU's Not Unix&rdquo; (GNU Unix Değildir) diye adlandırdık."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Historically, AT&amp;T which developed Unix did not want anyone to give it "
 "credit by using &ldquo;Unix&rdquo; in the name of a similar system, not even "
@@ -2691,7 +2744,7 @@
 "kendilerine &ldquo;Unix&rdquo; kelimesini içermeyen farklı isimler "
 "seçmişlerdir."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we say &ldquo;GNU/BSD&rdquo; too? <span class=\"anchor-reference-id\">"
 "(<a href=\"#bsd\">#bsd</a>)</span>"
@@ -2699,7 +2752,7 @@
 "&ldquo;GNU/BSD&rdquo; de dememiz gerekir mi? <span class=\"anchor-reference-"
 "id\">(<a href=\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems, "
 "because that term does not fit the history of the BSD systems."
@@ -2707,9 +2760,15 @@
 "BSD sistemlerini (FreeBSD, vb.) &ldquo;GNU/BSD&rdquo; sistemleri olarak "
 "isimlendirmiyoruz, çünkü bu terim, BSD sistemlerinin tarihiyle uyuşmuyor."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The BSD system was developed by UC Berkeley as non-free software in the "
+#| "80s, and became free in the early 90s.  A free operating system that "
+#| "exists today is almost certainly either a variant of the GNU system, or a "
+#| "kind of BSD system."
 msgid ""
-"The BSD system was developed by UC Berkeley as non-free software in the 80s, "
+"The BSD system was developed by UC Berkeley as nonfree software in the 80s, "
 "and became free in the early 90s.  A free operating system that exists today "
 "is almost certainly either a variant of the GNU system, or a kind of BSD "
 "system."
@@ -2719,7 +2778,7 @@
 "özgür bir işletim sistemi çok büyük bir olasılıkla ya GNU sisteminin 
ya da "
 "BSD sisteminin bir çeşitlemesidir."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "People sometimes ask whether BSD too is a variant of GNU, as GNU/Linux is.  "
 "It is not.  The BSD developers were inspired to make their code free "
@@ -2734,7 +2793,7 @@
 "özgürleştirmeye başlamak için ikna olmalarını sağlamıştır. Fakat 
BSD kodları "
 "GNU'nunkiler ile pek örtüşmez."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "BSD systems today use some GNU packages, just as the GNU system and its "
 "variants use some BSD programs; however, taken as wholes, they are two "
@@ -2748,7 +2807,7 @@
 "farklı sistemdir. BSD geliştiricileri bir çekirdek yazıp GNU sistemine "
 "eklemediler, bu yüzden GNU/BSD gibi bir isim duruma uygun değildir."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The connection between GNU/Linux and GNU is much closer, and that's why the "
 "name &ldquo;GNU/Linux&rdquo; is appropriate for it."
@@ -2756,7 +2815,7 @@
 "GNU/Linux ve GNU arasındaki bağlantı daha yakındır ve bu yüzden 
&ldquo;GNU/"
 "Linux&rdquo; ismi sistemin adı olmaya uygundur."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is a version of GNU which uses the kernel from NetBSD.  Its developers "
 "call it &ldquo;Debian GNU/NetBSD&rdquo;, but &ldquo;GNU/"
@@ -2770,7 +2829,7 @@
 "NetBSDçekirdeği&rdquo; daha doğru olacaktır. Sistemin büyük kısmı 
GNU/Linux "
 "sistemi ile aynı olduğu için, buna bir BSD sistemi denemez."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "If I install the GNU tools on Windows, does that mean I am running a GNU/"
 "Windows system? <span class=\"anchor-reference-id\">(<a href=\"#othersys"
@@ -2780,7 +2839,7 @@
 "sistemi kullandığım anlamına mı gelir? <span 
class=\"anchor-reference-id\">"
 "(<a href=\"#othersys\">#othersys</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
 "GNU are just a part of the GNU software, which is just a part of the GNU "
@@ -2794,7 +2853,7 @@
 "içermeyen bambaşka bir işletim sistemi olacaktır. Neticede bu durum, GNU/"
 "Linux'tan tamamen farklıdır."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can't Linux be used without GNU? <span class=\"anchor-reference-id\">(<a "
 "href=\"#justlinux\">#justlinux</a>)</span>"
@@ -2802,7 +2861,7 @@
 "Linux, GNU'suz kullanılamaz mı? <span class=\"anchor-reference-id\">(<a 
href="
 "\"#justlinux\">#justlinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is used by itself, or with small other programs, in some appliances.  "
 "These small software systems are a far cry from the GNU/Linux system.  Users "
@@ -2817,7 +2876,7 @@
 "olduğunu göstermek için bu cihazların sadece Linux çalıştırdığını 
söylemek "
 "faydalıdır."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How much of the GNU system is needed for the system to be GNU/Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
@@ -2825,7 +2884,7 @@
 "Sistemin GNU/Linux olması için GNU sisteminin ne kadarına ihtiyaç var? 
<span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "&ldquo;How much&rdquo; is not a meaningful question because the GNU system "
 "does not have precise boundaries."
@@ -2833,7 +2892,7 @@
 "&ldquo;Ne kadar&rdquo; anlamlı bir soru değil çünkü GNU sisteminin kesin 
"
 "sınırları yok."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is an operating system maintained by a community.  It includes far more "
 "than just the GNU software packages (of which we have a specific list), and "
@@ -2850,7 +2909,7 @@
 "atlarsanız &ldquo;ne kadar&rdquo; kullandığınızı söylemenin anlamlı 
bir yolu "
 "yoktur."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we look at the level of packages, Linux is one important package in the "
 "GNU/Linux system.  The inclusion of one important GNU package is enough to "
@@ -2860,7 +2919,7 @@
 "Önemli bir GNU paketinin dahil edilmesi, eşit söz talebimizi haklı 
çıkarmak "
 "için yeterlidir."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Are there complete Linux systems [sic] without GNU? <span class=\"anchor-"
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
@@ -2870,7 +2929,7 @@
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There are complete systems that contain Linux and not GNU; Android is an "
 "example.  But it is a mistake to call them &ldquo;Linux&rdquo; systems, just "
@@ -2880,7 +2939,7 @@
 "&ldquo;Linux&rdquo; sistemleri olarak adlandırmak bir hatadır, tıpkı 
GNU'yu "
 "bir &ldquo;Linux&rdquo; sistemi olarak adlandırmak gibi bir hatadır."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android is very different from the GNU/Linux system&mdash;because the two "
 "have very little code in common.  In fact, the only thing they have in "
@@ -2889,7 +2948,7 @@
 "Android, GNU/Linux sisteminden çok farklı çünkü ikisinin ortak kodu çok 
az. "
 "Aslında,ortak olan tek şey Linux'tur."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
 "necessary to say things like, &ldquo;Android contains Linux, but it isn't "
@@ -2900,7 +2959,7 @@
 "içerir ancak Linux değildir çünkü her zamanki Linux [sic] 
kütüphanelerine ve "
 "yardımcı programlarına sahip değildir [GNU sistemi anlamına 
gelir].&rdquo;"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android contains just as much of Linux as GNU/Linux does.  What it doesn't "
 "have is the GNU system.  Android replaces that with Google software that "
@@ -2911,7 +2970,7 @@
 "sistemi. Android bunu oldukça farklı çalışan Google yazılımı ile 
değiştirir. "
 "Android'i GNU/Linux'tan farklı kılan şey GNU'nun olmamasıdır."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Is it correct to say &ldquo;using Linux&rdquo; if it refers to using GNU/"
 "Linux and using Android? <span class=\"anchor-reference-id\">(<a href="
@@ -2923,7 +2982,7 @@
 "\"#usegnulinuxandandroidlinuxsyswithoutgnu"
 "\">#usegnulinuxandandroidlinuxsyswithoutgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Far from it.  That usage is so strained that people will not understand the "
 "intended meaning."
@@ -2931,7 +2990,7 @@
 "Alakası yok. Bu kullanım o kadar zorlama ki insanlar amaçlanan anlamı "
 "anlamayacaklar."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public will find it very strange to speak of using Android as &ldquo;"
 "using Linux&rdquo;.  It's like having a conversation, then saying you were "
@@ -2941,7 +3000,7 @@
 "bulacak. Sohbet etmek gibi bir şey, daha sonra kişinin bağırsaklarıyla 
veya "
 "kişinin dolaşım sistemi ile konuştuğunu söylemek gibi."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public <em>will</em> understand the idea of &ldquo;using Linux&rdquo; "
 "when it's really GNU/Linux, by way of the usual misunderstanding: thinking "
@@ -2951,7 +3010,7 @@
 "kullanma fikrini anlaya<em>cak</em>tır: Tüm sistemi &ldquo;Linux&rdquo; "
 "olarak düşünmek."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Use of Android and use of GNU/Linux are totally different, as different as "
 "driving a car and riding a bicycle.  The fact that the first two both "
@@ -2973,7 +3032,7 @@
 "şekilde GNU/Linux ve Android kullanımı hakkında konuşmanın net yolu; 
&ldquo;"
 "GNU/Linux ve Android kullanmak&rdquo; demektir."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not call the system &ldquo;Linux&rdquo; anyway, and strengthen Linus "
 "Torvalds' role as posterboy for our community? <span class=\"anchor-"
@@ -2983,7 +3042,7 @@
 "topluluğumuzdaki medya maymunu imajını güçlendirmiyoruz? <span class="
 "\"anchor-reference-id\">(<a href=\"#helplinus\">#helplinus</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Linus Torvalds is the &ldquo;posterboy&rdquo; (other people's choice of "
 "word, not ours) for his goals, not ours.  His goal is to make the system "
@@ -3001,12 +3060,22 @@
 "philosophy/why-free.html\">işbirliği özgürlüğü</a>nü savunmadı. Bu 
yüzden de "
 "insanlar &ldquo;Linux&rdquo; ismini bu ilkeyle bağdaştırmıyor."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Linus publicly states his disagreement with the free software movement's "
+#| "ideals.  He developed non-free software in his job for many years (and "
+#| "said so to a large audience at a &ldquo;Linux&rdquo;World show), and "
+#| "publicly invited fellow developers of Linux, the kernel, to use non-free "
+#| "software to work on it with him.  He goes even further, and rebukes "
+#| "people who suggest that engineers and scientists should consider social "
+#| "consequences of our technical work&mdash;rejecting the lessons society "
+#| "learned from the development of the atom bomb."
 msgid ""
 "Linus publicly states his disagreement with the free software movement's "
-"ideals.  He developed non-free software in his job for many years (and said "
+"ideals.  He developed nonfree software in his job for many years (and said "
 "so to a large audience at a &ldquo;Linux&rdquo;World show), and publicly "
-"invited fellow developers of Linux, the kernel, to use non-free software to "
+"invited fellow developers of Linux, the kernel, to use nonfree software to "
 "work on it with him.  He goes even further, and rebukes people who suggest "
 "that engineers and scientists should consider social consequences of our "
 "technical work&mdash;rejecting the lessons society learned from the "
@@ -3022,7 +3091,7 @@
 "aslında toplumun, atom bombasının geliştirilmesinden çıkardığı dersi 
"
 "reddetmek demektir."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with writing a free program for the motivations of "
 "learning and having fun; the kernel Linus wrote for those reasons was an "
@@ -3041,7 +3110,7 @@
 "vardır. Fakat insanlar, söz konusu işletim sisteminin, Linus'un "
 "görüşlerinden değil, özgürlük ideallerinden doğduğunu bilmelidir."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong for us to label Linus Torvalds' work as GNU? <span class="
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
@@ -3050,7 +3119,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong, so we don't do that.  Torvalds' work is Linux, the "
 "kernel; we are careful not to attribute that work to the GNU Project or "
@@ -3063,7 +3132,7 @@
 "sistemden söz ederken &ldquo;GNU/Linux&rdquo; adını kullanarak onun 
emeğini "
 "takdir ediyoruz."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Does Linus Torvalds agree that Linux is just the kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
@@ -3072,10 +3141,17 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</"
 "a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
+#| "versions/RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are "
+#| "GNU software and are under the GNU copyleft. These tools aren't in the "
+#| "distribution - ask me (or GNU)  for more info&rdquo;</a>."
 msgid ""
 "He recognized this at the beginning.  The earliest Linux release notes said, "
-"<a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"<a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
 "RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are GNU software "
 "and are under the GNU copyleft. These tools aren't in the distribution - ask "
 "me (or GNU)  for more info&rdquo;</a>."
@@ -3086,7 +3162,7 @@
 "yazılımı olup bunlar GNU copyleft lisansı altındadır. Bu araçlar 
dağıtımın "
 "içinde yer almaz. Daha fazla bilgi için bana (veya GNU'ya) 
sorun&rdquo;</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not finish the GNU Hurd kernel, release the GNU system as a whole, and "
 "forget the question of what to call GNU/Linux? <span class=\"anchor-"
@@ -3097,7 +3173,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#finishhurd\">#finishhurd</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We would like credit for the GNU operating system no matter which kernel is "
 "used with it."
@@ -3105,13 +3181,20 @@
 "Hangi çekirdeğin kullanılacağına bakılmaksızın GNU işletim sistemi 
için "
 "takdir istiyoruz."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Making the GNU Hurd work well enough to compete with Linux would be a big "
+#| "job, and it's not clearly necessary.  The only thing ethically wrong with "
+#| "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the "
+#| "best fix for that problem is <a href=\"http://fsf.org/campaigns/priority-";
+#| "projects\"> developing free replacement for the blobs</a>."
 msgid ""
 "Making the GNU Hurd work well enough to compete with Linux would be a big "
 "job, and it's not clearly necessary.  The only thing ethically wrong with "
 "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the best "
-"fix for that problem is <a href=\"http://fsf.org/campaigns/priority-projects";
-"\"> developing free replacement for the blobs</a>."
+"fix for that problem is <a href=\"https://www.fsf.org/campaigns/priority-";
+"projects\"> developing free replacement for the blobs</a>."
 msgstr ""
 "GNU Hurd'un Linux ile rekabet edebilecek kadar iyi çalışmasını sağlamak 
"
 "büyük bir iş olacaktır ve bu açıkça gerekli değildir. Bir çekirdek 
olarak "
@@ -3119,7 +3202,7 @@
 "eklenmesidir; bu sorun için en iyi çözüm,<a 
href=\"http://fsf.org/campaigns/";
 "priority-projects\"> blob'lar için özgür ikameler geliştirmektir</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The battle is already lost&mdash;society has made its decision and we can't "
 "change it, so why even think about it? <span class=\"anchor-reference-id\">"
@@ -3129,7 +3212,7 @@
 "halde neden hâlâ bunu düşünüp duruyoruz? <span 
class=\"anchor-reference-id\">"
 "(<a href=\"#lost\">#lost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This isn't a battle, it is a campaign of education.  What to call the system "
 "is not a single decision, to be made at one moment by &ldquo;society&rdquo;: "
@@ -3145,7 +3228,7 @@
 "ama sisteme kendiniz &ldquo;GNU/Linux&rdquo; demeye karar verebilirsiniz. "
 "Böyle yaparak da başkalarını eğitmeye yardımcı olmuş olursunuz."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Society has made its decision and we can't change it, so what good does it "
 "do if I say &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id\">(<a "
@@ -3155,7 +3238,7 @@
 "Linux&rdquo; dememin ne faydası var? <span class=\"anchor-reference-id\">(<a 
"
 "href=\"#whatgood\">#whatgood</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is not an all-or-nothing situation: correct and incorrect pictures are "
 "being spread more or less by various people.  If you call the system &ldquo;"
@@ -3176,7 +3259,7 @@
 "insanı, çok az çaba ile, eğitmiş olursunuz. Onlardan bazıları da, bu 
doğruyu "
 "başkalarına yayar."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to call the system &ldquo;Linux&rdquo; and teach "
 "people its real origin with a ten-minute explanation? <span class=\"anchor-"
@@ -3186,7 +3269,7 @@
 "sistemin gerçek kökenini öğretsek daha iyi olmaz mı? <span 
class=\"anchor-"
 "reference-id\">(<a href=\"#explain\">#explain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "If you help us by explaining to others in that way, we appreciate your "
 "effort, but that is not the best method.  It is not as effective as calling "
@@ -3197,7 +3280,7 @@
 "isimlendirmek kadar etkili olmayacak ve zamanınızı verimsiz kullanmanıza 
yol "
 "açacaktır."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is ineffective because it may not sink in, and surely will not "
 "propagate.  Some of the people who hear your explanation will pay attention, "
@@ -3214,7 +3297,7 @@
 "diyeceklerdir. Özellikle böyle bir niyetleri olmasa da yanlış resmin "
 "yayılmasına yardımcı olacaklardır."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is inefficient because it takes a lot more time.  Saying and writing "
 "&ldquo;GNU/Linux&rdquo; will take you only a few seconds a day, not minutes, "
@@ -3228,7 +3311,7 @@
 "GNU/Linux'u birbirinden ayırmak GNU Projesi’ne etkili bir biçimde yardım 
"
 "etmenin en kolay yoludur."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people laugh at you when you ask them to call the system GNU/Linux.  "
 "Why do you subject yourself to this treatment? <span class=\"anchor-"
@@ -3238,7 +3321,7 @@
 "ediyorlar. Neden kendinizi bu muameleye maruz bırakıyorsunuz? <span class="
 "\"anchor-reference-id\">(<a href=\"#treatment\">#treatment</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; tends to give people a mistaken "
 "picture of the system's history and reason for existence.  People who laugh "
@@ -3253,7 +3336,7 @@
 "de emeğimizin takdir edilmesini istediğimizde bize gülüyorlar. Eğer 
doğruyu "
 "bilselerdi, muhtemelen gülmezlerdi."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Why do we take the risk of making a request that sometimes leads people to "
 "ridicule us? Because often it has useful results that help the GNU Project.  "
@@ -3264,7 +3347,7 @@
 "sonuçları oluyor. Amacımıza ulaşmak için hak etmediğimiz bir muameleye 
maruz "
 "kalma riskini kabulleniyoruz."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you see such an ironically unfair situation occurring, please don't sit "
 "idly by.  Please teach the laughing people the real history.  When they see "
@@ -3275,7 +3358,7 @@
 "gerçek tarihi anlatın. İstediğiniz şeyin dayanağı olduğunu 
gördüklerinde, "
 "birazcık mantık sahibi olanlar gülmeyi keseceklerdir."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people condemn you when you ask them to call the system GNU/Linux.  "
 "Don't you lose by alienating them? <span class=\"anchor-reference-id\">(<a "
@@ -3285,7 +3368,7 @@
 "kendinizden uzaklaştırarak kaybetmiyor musunuz? <span class=\"anchor-"
 "reference-id\">(<a href=\"#alienate\">#alienate</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not much.  People who don't appreciate our role in developing the system are "
 "unlikely to make substantial efforts to help us.  If they do work that "
@@ -3302,7 +3385,7 @@
 "başka birilerine atfetme alışkanlığını diğer insanlara da 
aşılayarak, başka "
 "insanlardan yardım alma olanaklarımızı da sekteye uğratıyorlar."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It makes no sense to worry about alienating people who are already mostly "
 "uncooperative, and it is self-defeating to be deterred from correcting a "
@@ -3315,7 +3398,7 @@
 "durmamız kendi kendimizi baltalamamız demek olacaktır. Bu sebeple, 
yanlış "
 "adlandırmayı düzeltme çabalarımızı sürdüreceğiz."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Whatever you contributed, is it legitimate to rename the operating system? "
 "<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
@@ -3324,7 +3407,7 @@
 "meşru mudur? <span class=\"anchor-reference-id\">(<a href=\"#rename"
 "\">#rename</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are not renaming anything; we have been calling this system &ldquo;"
 "GNU&rdquo; ever since we announced it in 1983.  The people who tried to "
@@ -3335,7 +3418,7 @@
 "olan, sistemin adını &ldquo;Linux&rdquo; olarak değiştirmeye çalışan "
 "insanların yaptıklarıdır."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong to force people to call the system &ldquo;GNU/Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
@@ -3344,7 +3427,7 @@
 "yanlış değil mi? <span class=\"anchor-reference-id\">(<a href=\"#force"
 "\">#force</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong to force them, and we don't try.  We call the system "
 "&ldquo;GNU/Linux&rdquo;, and we ask you to do it too."
@@ -3353,7 +3436,7 @@
 "kalkışmıyoruz. Biz sisteme &ldquo;GNU/Linux&rdquo; diyoruz ve sizden de "
 "böyle demenizi talep ediyoruz."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not sue people who call the whole system &ldquo;Linux&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
@@ -3362,7 +3445,7 @@
 "etmiyorsunuz? <span class=\"anchor-reference-id\">(<a href=\"#whynotsue"
 "\">#whynotsue</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are no legal grounds to sue them, but since we believe in freedom of "
 "speech, we wouldn't want to do that anyway.  We ask people to call the "
@@ -3372,7 +3455,7 @@
 "olarak, böyle bir davranışa girmek istemezdik zaten. Biz insanlardan 
sisteme "
 "&ldquo;GNU/Linux&rdquo; demelerini, doğrusu bu olduğu için istiyoruz."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Shouldn't you put something in the GNU GPL to require people to call the "
 "system &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id\">(<a href="
@@ -3382,13 +3465,23 @@
 "bir ifadeyi GNU GPL’ye yerleştirmeniz gerekmiyor mu? <span class=\"anchor-"
 "reference-id\">(<a href=\"#require\">#require</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU GPL is to protect the users' freedom from those "
+#| "who would make proprietary versions of free software.  While it is true "
+#| "that those who call the system &ldquo;Linux&rdquo; often do things that "
+#| "limit the users' freedom, such as bundling non-free software with the GNU/"
+#| "Linux system or even developing non-free software for such use, the mere "
+#| "act of calling the system &ldquo;Linux&rdquo; does not, in itself, deny "
+#| "users their freedom.  It seems improper to make the GPL restrict what "
+#| "name people can use for the system."
 msgid ""
 "The purpose of the GNU GPL is to protect the users' freedom from those who "
 "would make proprietary versions of free software.  While it is true that "
 "those who call the system &ldquo;Linux&rdquo; often do things that limit the "
-"users' freedom, such as bundling non-free software with the GNU/Linux system "
-"or even developing non-free software for such use, the mere act of calling "
+"users' freedom, such as bundling nonfree software with the GNU/Linux system "
+"or even developing nonfree software for such use, the mere act of calling "
 "the system &ldquo;Linux&rdquo; does not, in itself, deny users their "
 "freedom.  It seems improper to make the GPL restrict what name people can "
 "use for the system."
@@ -3402,7 +3495,7 @@
 "başına, kullanıcıların özgürlüklerini elinden almaz. GPL'nin, 
insanlara "
 "sistem için kullanacakları isim konusunda kısıtlamalar getirmesi uygun 
olmaz."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you objected to the original BSD license's advertising requirement to "
 "give credit to the University of California, isn't it hypocritical to demand "
@@ -3415,7 +3508,7 @@
 "ikiyüzlü bir davranış değil mi? <span class=\"anchor-reference-id\">(<a 
href="
 "\"#BSDlicense\">#BSDlicense</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would be hypocritical to make the name GNU/Linux a license requirement, "
 "and we don't.  We only <em>ask</em> you to give us the credit we deserve."
@@ -3424,7 +3517,7 @@
 "davranış olurdu. Biz de bunu yapmıyoruz zaten. Biz sizden sadece "
 "hakkettiğimiz payı vermenizi <em>istiyoruz</em>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please note that there are at least <a href=\"/licenses/bsd.html\"> two "
 "different BSD licenses</a>.  For clarity's sake, please don't use the term "
@@ -3434,7 +3527,7 @@
 "olduğunu unutmayın. Netlik için lütfen hangisi olduğunu belirtmeden 
&ldquo;"
 "BSD&rdquo; lisansı terimini kullanmayın."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you failed to put something in the GNU GPL to require people to call "
 "the system &ldquo;GNU&rdquo;, you deserve what happened; why are you "
@@ -3446,7 +3539,7 @@
 "diye şikayet ediyorsunuz? <span class=\"anchor-reference-id\">(<a href="
 "\"#deserve\">#deserve</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The question presupposes a rather controversial general ethical premise: "
 "that if people do not force you to treat them fairly, you are entitled to "
@@ -3458,11 +3551,11 @@
 "onlardan istediğiniz kadar faydalanmaya hak kazanmış oluyorsunuz. Başka 
bir "
 "deyişle bu önerme, “güçlü olan haklıdır” sözünü savunuyor."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope you disagree with that premise just as we do."
 msgstr "Umarız siz de bizim gibi, bu önermeye karşı çıkıyorsunuzdur."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't you be better off not contradicting what so many people believe? "
 "<span class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)"
@@ -3472,7 +3565,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't think we should go along with large numbers of people because they "
 "have been misled.  We hope you too will decide that truth is important."
@@ -3481,7 +3574,7 @@
 "onlarla beraber yürüyebileceğimizi düşünmüyoruz. Umarız siz de 
hakikatin "
 "önemli olduğuna karar verirsiniz."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We could never have developed a free operating system without first denying "
 "the belief, held by most people, that proprietary software was legitimate "
@@ -3491,7 +3584,7 @@
 "pek çok insan tarafından paylaşılan inancı reddetmeseydik asla özgür 
bir "
 "işletim sistemi geliştiremezdik."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
 "<span class=\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</"
@@ -3501,13 +3594,13 @@
 "isimlendirmeyi doğru kılmaz mı? <span class=\"anchor-reference-id\">(<a 
href="
 "\"#somanyright\">#somanyright</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "We don't think that the popularity of an error makes it the truth."
 msgstr ""
 "Biz bir yanlışın popülerlik derecesinin, onu bir hakikat haline 
getirdiğini "
 "düşünmüyoruz."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it better to call the system by the name most users already know? "
 "<span class=\"anchor-reference-id\">(<a href=\"#knownname\">#knownname</a>)</"
@@ -3517,7 +3610,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#knownname\">#knownname</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo; includes "
 "&ldquo;Linux&rdquo;, they will recognize what you're talking about.  If you "
@@ -3529,7 +3622,7 @@
 "(çoğu zaman hatalı bir şekilde &lsquo;Linux&rsquo; olarak 
adlandırılır)"
 "&rdquo; eklerseniz hepsi anlar."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many people care about what's convenient or who's winning, not about "
 "arguments of right or wrong.  Couldn't you get more of their support by a "
@@ -3541,12 +3634,19 @@
 "yol izleseniz olmaz mıydı? <span class=\"anchor-reference-id\">(<a href="
 "\"#winning\">#winning</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+#, fuzzy
+#| msgid ""
+#| "To care only about what's convenient or who's winning is an amoral "
+#| "approach to life.  Non-free software is an example of that amoral "
+#| "approach and thrives on it.  Thus, in the long run it would be self-"
+#| "defeating for us to adopt that approach.  We will continue talking in "
+#| "terms of right and wrong."
 msgid ""
 "To care only about what's convenient or who's winning is an amoral approach "
-"to life.  Non-free software is an example of that amoral approach and "
-"thrives on it.  Thus, in the long run it would be self-defeating for us to "
-"adopt that approach.  We will continue talking in terms of right and wrong."
+"to life.  Nonfree software is an example of that amoral approach and thrives "
+"on it.  Thus, in the long run it would be self-defeating for us to adopt "
+"that approach.  We will continue talking in terms of right and wrong."
 msgstr ""
 "Neyin kullanışlı olduğuyla ya da kimin kazandığıyla ilgilenmek hayata 
karşı "
 "ahlak dışı bir bakış açısıdır. Özgür olmayan yazılımlar bu ahlak 
dışı "
@@ -3554,7 +3654,7 @@
 "bu yaklaşıma boyun eğmek, kendi kendimizi baltalamak demek olacaktır. 
Neyin "
 "doğru, neyin yanlış olduğunu ifade etmeye devam edeceğiz."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope that you are one of those for whom right and wrong do matter."
 msgstr "Umarız siz, doğru ve yanlışı önemseyenlerdensinizdir."
 
@@ -3605,9 +3705,13 @@
 "\">çalışma&nbsp;sayfamızı</a> ziyaret edebilirsiniz."
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
+#| "Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation, "
+"Inc."
 msgstr ""
 "Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
 "Free Software Foundation, Inc."

Index: gnu/po/gnu-linux-faq.uk-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.uk-diff.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gnu/po/gnu-linux-faq.uk-diff.html   8 Jun 2021 08:44:38 -0000       1.16
+++ gnu/po/gnu-linux-faq.uk-diff.html   30 Aug 2021 13:34:53 -0000      1.17
@@ -10,35 +10,34 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.84</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&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.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;GNU/Linux FAQ
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/gnu/po/gnu-linux-faq.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;GNU/Linux FAQ 
by</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;GNU/Linux FAQ&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;GNU/Linux <span class="removed"><del><strong>FAQ 
by</strong></del></span> <span class="inserted"><ins><em>FAQ&lt;/h2&gt;
 
-&lt;address class="byline c"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;</strong></del></span> <span 
class="inserted"><ins><em>Stallman&lt;/address&gt;
+&lt;address class="byline"&gt;by</em></ins></span> Richard <span 
class="removed"><del><strong>Stallman&lt;/h2&gt;
 
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;To</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;To</em></ins></span> learn more about 
this issue, you can also read
+  &lt;blockquote&gt;&lt;p&gt;To learn more about this issue, you can also read
 our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
Project&lt;/a&gt;, our
  page on &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;
 and our page on &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU
-Users Who Have Never Heard of <span 
class="removed"><del><strong>GNU&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;</strong></del></span>
 <span class="inserted"><ins><em>GNU&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
-&lt;/div&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;
+Users Who Have Never Heard of GNU&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span> <span 
class="inserted"><ins><em>Stallman&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;
 When people see that we use and recommend the name GNU/Linux for a
 system that many others call just &ldquo;Linux&rdquo;, they ask many questions.
 Here are common questions, and our answers.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;div class="toc"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;h3 class="no-display"&gt;Table of Contents&lt;/h3&gt;</em></ins></span>
 &lt;ul&gt;
 
 &lt;li&gt;&lt;a href="#why"&gt;Why do you call the system we use GNU/Linux and 
not Linux?&lt;/a&gt;&lt;/li&gt;
@@ -299,7 +298,16 @@
     get more of their support by a different road?&lt;/a&gt;&lt;/li&gt;
 
 &lt;/ul&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;</em></ins></span>
+<span class="inserted"><ins><em>&lt;/div&gt;
+
+&lt;div class="announcement comment" role="complementary"&gt;
+&lt;p&gt;To learn more about this issue, you can also read
+our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
System&lt;/a&gt;, our
+ page on &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;
+and our page on &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU
+Users Who Have Never Heard of GNU&lt;/a&gt;.&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;</em></ins></span>
 
 &lt;dl&gt;
 
@@ -340,10 +348,16 @@
 
 &lt;dt id="what"&gt;What is the real relationship between GNU and Linux? 
&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#what"&gt;#what&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
-&lt;dd&gt;The GNU operating system and the Linux kernel are separate
+<span class="removed"><del><strong>&lt;dd&gt;The</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;dd&gt;
+&lt;p&gt;
+The</em></ins></span> GNU operating system and the Linux kernel are separate
 software projects that do complementary jobs.  Typically they are
 packaged in a &lt;a href="/distros/distros.html"&gt;GNU/Linux 
distribution&lt;/a&gt;, and used
-together.&lt;/dd&gt;
+<span class="removed"><del><strong>together.&lt;/dd&gt;</strong></del></span>
+<span class="inserted"><ins><em>together.&lt;/p&gt;
+&lt;/dd&gt;</em></ins></span>
 
 &lt;dt id="howerror"&gt;How did it come about that most
     people call the system &ldquo;Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#howerror"&gt;#howerror&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
@@ -456,11 +470,12 @@
           support an individual's free speech rights to call the system by
           any name that individual chooses? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#freespeech"&gt;#freespeech&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Yes, indeed, we believe you have a free speech right to call the
 operating system by any name you wish.  We ask that people call it
 GNU/Linux as a matter of doing justice to the GNU project, to promote
 the values of freedom that GNU stands for, and to inform others that
-those values of freedom brought the system into existence.
+those values of freedom brought the system into <span 
class="removed"><del><strong>existence.</strong></del></span> <span 
class="inserted"><ins><em>existence.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="everyoneknows"&gt;Since everyone knows the role
@@ -490,11 +505,12 @@
     why does it matter what name I use? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#everyoneknows2"&gt;#everyoneknows2&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 If your words don't reflect your knowledge, you don't teach others.
 Most people who have heard of the GNU/Linux system think it is
 &ldquo;Linux&rdquo;, that it was started by Linus Torvalds, and that
 it was intended to be &ldquo;open source&rdquo;.  If you don't tell
-them, who will?
+them, who <span class="removed"><del><strong>will?</strong></del></span> <span 
class="inserted"><ins><em>will?&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="windows"&gt;Isn't shortening &ldquo;GNU/Linux&rdquo;
@@ -601,19 +617,21 @@
 &lt;dt id="brain"&gt;Isn't the kernel the brain of the system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#brain"&gt;#brain&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 A computer system is not much like a human body,
 and no part of it plays a role comparable to that of
-the brain in a human.
+the brain in a <span class="removed"><del><strong>human.</strong></del></span> 
<span class="inserted"><ins><em>human.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="kernelmost"&gt;Isn't writing the kernel most of the work in an
 operating system? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#kernelmost"&gt;#kernelmost&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-No, many components take a lot of work.
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
+No, many components take a lot of <span 
class="removed"><del><strong>work.</strong></del></span> <span 
class="inserted"><ins><em>work.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="nokernel"&gt;An operating system 
requires a kernel.
+&lt;dt id="nokernel"&gt;An operating system requires a kernel.
     Since the GNU Project didn't develop a kernel, how can
     the system be GNU?&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#nokernel"&gt;#nokernel&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -632,10 +650,10 @@
 &lt;p&gt;
 Linus Torvalds made an important contribution to the operating system
 we use; the GNU Project started earlier and contributed much more.
-The name &ldquo;GNU/Linux&rdquo; gives credit to each.&lt;/p&gt;
+The name &ldquo;GNU/Linux&rdquo; gives credit to 
each.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="notinstallable"&gt;How can GNU be an
+&lt;dt id="notinstallable"&gt;How can GNU be an
     operating system, if I can't get something called &ldquo;GNU&rdquo;
     and install it? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#notinstallable"&gt;#notinstallable&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -696,11 +714,12 @@
     feel of Linux&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#feel"&gt;#feel&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 There is no such thing as the &ldquo;feel of Linux&rdquo; because
 Linux has no user interfaces.  Like any modern kernel, Linux is a base
 for running programs; user interfaces belong elsewhere in the system.
 Human interaction with GNU/Linux always goes through other programs,
-and the &ldquo;feel&rdquo; comes from them.
+and the &ldquo;feel&rdquo; comes from <span 
class="removed"><del><strong>them.</strong></del></span> <span 
class="inserted"><ins><em>them.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="long"&gt;The problem with &ldquo;GNU/Linux&rdquo; is that it is too 
long.
@@ -791,7 +810,8 @@
 may simply not recognize we're talking about the same system.  If we
 say &ldquo;GNU/Linux&rdquo;, they can make a connection to what they have heard
 about.&lt;/li&gt;
-&lt;/ul&gt;&lt;p&gt;&lt;/p&gt;
+<span 
class="removed"><del><strong>&lt;/ul&gt;&lt;p&gt;&lt;/p&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/ul&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="trademarkfee"&gt;I would have
@@ -845,11 +865,12 @@
     GNU/systemd/Linux? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#others"&gt;#others&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+&lt;p&gt;
 systemd is a fairly important component, but not as important as the
 kernel (Linux), nor as important as the basis of the system as a whole
 (GNU).  However, if you want to emphasize the presence of systemd
 by calling the system &ldquo;GNU/systemd/Linux&rdquo;, there is nothing
-wrong with doing so.
+wrong with doing so.&lt;/p&gt;
 &lt;/dd&gt;
 
 &lt;dt</em></ins></span> id="others"&gt;Many other projects contributed to
@@ -921,8 +942,8 @@
 &lt;p&gt;
 We're not talking about a distinct GNU version of Linux, the kernel.
 The free GNU/Linux distros do have
-a &lt;a href="http://directory.fsf.org/project/linux"&gt;separate version of
-Linux&lt;/a&gt;, since the &ldquo;standard&rdquo; version contains non-free
+a &lt;a <span 
class="removed"><del><strong>href="http://directory.fsf.org/project/linux"&gt;separate</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://directory.fsf.org/wiki/Linux-libre"&gt;separate</em></ins></span>
 version of
+Linux&lt;/a&gt;, since the &ldquo;standard&rdquo; version contains <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
 firmware &ldquo;blobs&rdquo;.  If this were part of the GNU Project,
 it could be considered &ldquo;GNU Linux&rdquo;; but we would not want
 to call it that, because it would be too confusing.&lt;/p&gt;
@@ -1042,13 +1063,13 @@
     free software?  After all, that is the ideal of GNU. &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#reserve"&gt;#reserve&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-The widespread practice of adding non-free software to the GNU/Linux
+The widespread practice of adding <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software to the GNU/Linux
 system is a major problem for our community.  It teaches the users
-that non-free software is ok, and that using it is part of the spirit
+that <span class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software is ok, and that 
using it is part of the spirit
 of &ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of 
their mission to
-help users use non-free add-ons, and may even invite salesmen to come
+help users use <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> add-ons, and may even 
invite salesmen to come
 and make sales pitches for them.  They adopt goals such as &ldquo;helping
-the users&rdquo; of GNU/Linux (including helping them use non-free
+the users&rdquo; of GNU/Linux (including helping them use <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span>
 applications and drivers), or making the system more popular even at
 the cost of freedom.
 &lt;p&gt;
@@ -1066,7 +1087,7 @@
 versions &lt;em&gt;are&lt;/em&gt; versions of GNU, that they all are based on a
 system that exists specifically for the sake of the users' freedom.
 With this understanding, they can start to recognize the distributions
-that include non-free software as perverted, adulterated versions of
+that include <span class="removed"><del><strong>non-free</strong></del></span> 
<span class="inserted"><ins><em>nonfree</em></ins></span> software as 
perverted, adulterated versions of
 GNU, instead of thinking they are proper and appropriate &ldquo;versions of
 Linux&rdquo;.&lt;/p&gt;
 &lt;p&gt;
@@ -1219,7 +1240,7 @@
 (there were already many of them, for various systems), but instead of
 calling it by a dull name like &ldquo;&lt;em&gt;somethingorother&lt;/em&gt; 
TECO&rdquo;, he
 thought of a clever amusing name.  (That's what hacking
-means: &lt;a href="http://stallman.org/articles/on-hacking.html"&gt;playful
+means: &lt;a <span 
class="removed"><del><strong>href="http://stallman.org/articles/on-hacking.html"&gt;playful</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://stallman.org/articles/on-hacking.html"&gt;playful</em></ins></span>
 cleverness&lt;/a&gt;.)&lt;/p&gt;
 &lt;p&gt;
 Other hackers enjoyed that name so much that we imitated the approach.
@@ -1245,7 +1266,7 @@
 We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems,
 because that term does not fit the history of the BSD systems.
 &lt;p&gt;
-The BSD system was developed by UC Berkeley as non-free software in
+The BSD system was developed by UC Berkeley as <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software in
 the 80s, and became free in the early 90s.  A free operating system
 that exists today is almost certainly either a variant of the GNU
 system, or a kind of BSD system.&lt;/p&gt;
@@ -1276,25 +1297,27 @@
 on Windows, does that mean I am running a GNU/Windows system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#othersys"&gt;#othersys&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of 
GNU
 are just a part of the GNU software, which is just a part of the GNU
 system, and underneath them you would still have another complete
 operating system which has no code in common with GNU.  All in all,
-that's a very different situation from GNU/Linux.
+that's a very different situation from <span 
class="removed"><del><strong>GNU/Linux.</strong></del></span> <span 
class="inserted"><ins><em>GNU/Linux.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="justlinux"&gt;Can't Linux be used without GNU? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#justlinux"&gt;#justlinux&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Linux is used by itself, or with small other programs, in some
 appliances.  These small software systems are a far cry from the
 GNU/Linux system.  Users do not install them on PCs, for instance, and
 would find them rather disappointing.  It is useful to say that these
 appliances run just Linux, to show how different those small platforms
-are from GNU/Linux.
+are from <span class="inserted"><ins><em>GNU/Linux.&lt;/p&gt;
 &lt;/dd&gt;
 
-&lt;dt <span class="inserted"><ins><em>id="howmuch"&gt;How much of the GNU 
system is needed for the system
+&lt;dt id="howmuch"&gt;How much of the GNU system is needed for the system
 to be
 GNU/Linux? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#howmuch"&gt;#howmuch&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
@@ -1305,17 +1328,17 @@
 GNU is an operating system maintained by a community.  It includes far
 more than just the GNU software packages (of which we have a specific
 list), and people add more packages constantly.  Despite these
-changes, it remains the GNU system, and adding Linux to that yields
-GNU/Linux.  If you use part of the GNU system and omit part, there is
+changes, it remains the GNU system, and adding Linux to that 
yields</em></ins></span>
+GNU/Linux.  <span class="inserted"><ins><em>If you use part of the GNU system 
and omit part, there is
 no meaningful way to say &ldquo;how much&rdquo; you used.&lt;/p&gt;
 &lt;p&gt;
 If we look at the level of packages, Linux is one important package in
 the GNU/Linux system.  The inclusion of one important GNU package is
 enough to justify our request for equal mention.
-&lt;/p&gt;
+&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
-&lt;dt</em></ins></span> id="linuxsyswithoutgnu"&gt;Are there complete Linux 
systems [sic] without GNU? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#linuxsyswithoutgnu"&gt;#linuxsyswithoutgnu&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
+&lt;dt id="linuxsyswithoutgnu"&gt;Are there complete Linux systems [sic] 
without GNU? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#linuxsyswithoutgnu"&gt;#linuxsyswithoutgnu&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
 There are complete systems that contain Linux and not GNU; Android is
@@ -1395,10 +1418,11 @@
 &ldquo;Linux&rdquo; with that principle.
 &lt;p&gt;
 Linus publicly states his disagreement with the free software
-movement's ideals.  He developed non-free software in his job for many
+movement's ideals.  He developed <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software in his job for many
 years (and said so to a large audience at a &ldquo;Linux&rdquo;World show), and
 publicly invited fellow developers of Linux, the kernel, to use
-non-free software to work on it with him.  He goes even further, and
+<span class="removed"><del><strong>non-free</strong></del></span>
+<span class="inserted"><ins><em>nonfree</em></ins></span> software to work on 
it with him.  He goes even further, and
 rebukes people who suggest that engineers and scientists should
 consider social consequences of our technical work&mdash;rejecting the
 lessons society learned from the development of the atom bomb.&lt;/p&gt;
@@ -1417,11 +1441,13 @@
     work as GNU? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#claimlinux"&gt;#claimlinux&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 It would be wrong, so we don't do that.  Torvalds' work is Linux, the
 kernel; we are careful not to attribute that work to the GNU Project
 or label it as &ldquo;GNU&rdquo;.  When we talk about the whole
 system, the name &ldquo;GNU/Linux&rdquo; gives him a share of the
-credit.
+<span class="removed"><del><strong>credit.</strong></del></span>
+<span class="inserted"><ins><em>credit.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 
@@ -1431,7 +1457,8 @@
 &lt;dd&gt;
 &lt;p&gt;He recognized this at the beginning.  The earliest Linux release notes
 said, &lt;a
-href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+<span 
class="removed"><del><strong>href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
 &ldquo;Most of the tools used with linux are GNU software and are under the
 GNU copyleft. These tools aren't in the distribution - ask me (or GNU)
 for more info&rdquo;&lt;/a&gt;.&lt;/p&gt;
@@ -1449,7 +1476,7 @@
 a big job, and it's not clearly necessary.  The only thing ethically
 wrong with Linux as a kernel is its inclusion of firmware
 &ldquo;blobs&rdquo;; the best fix for that problem
-is &lt;a href="http://fsf.org/campaigns/priority-projects"&gt; developing
+is &lt;a <span 
class="removed"><del><strong>href="http://fsf.org/campaigns/priority-projects"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.fsf.org/campaigns/priority-projects"&gt;</em></ins></span>
 developing
 free replacement for the blobs&lt;/a&gt;.&lt;/p&gt;
 &lt;/dd&gt;
 
@@ -1458,12 +1485,13 @@
     it? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#lost"&gt;#lost&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 This isn't a battle, it is a campaign of education.  What to call the
 system is not a single decision, to be made at one moment by
 &ldquo;society&rdquo;: each person, each organization, can decide what
 name to use.  You can't make others say &ldquo;GNU/Linux&rdquo;, but
 you can decide to call the system &ldquo;GNU/Linux&rdquo;
-yourself&mdash;and by doing so, you will help educate others.
+yourself&mdash;and by doing so, you will help educate <span 
class="removed"><del><strong>others.</strong></del></span> <span 
class="inserted"><ins><em>others.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="whatgood"&gt;Society has made its
@@ -1471,6 +1499,7 @@
     &ldquo;GNU/Linux&rdquo;? &lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#whatgood"&gt;#whatgood&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 This is not an all-or-nothing situation: correct and incorrect
 pictures are being spread more or less by various people.  If you call
 the system &ldquo;GNU/Linux&rdquo;, you will help others learn the system's 
true
@@ -1478,7 +1507,7 @@
 everywhere on your own, any more than we can, but you can help.  If
 only a few hundred people see you use the term &ldquo;GNU/Linux&rdquo;, you 
will
 have educated a substantial number of people with very little work.
-And some of them will spread the correction to others.
+And some of them will spread the correction to <span 
class="removed"><del><strong>others.</strong></del></span> <span 
class="inserted"><ins><em>others.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="explain"&gt;Wouldn't it be better to call
@@ -1549,39 +1578,44 @@
     is it legitimate to rename the operating system? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#rename"&gt;#rename&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 We are not renaming anything; we have been calling this system 
&ldquo;GNU&rdquo;
 ever since we announced it in 1983.  The people who tried to rename
-it to &ldquo;Linux&rdquo; should not have done so.&lt;/dd&gt;
+it to &ldquo;Linux&rdquo; should not have done <span 
class="removed"><del><strong>so.&lt;/dd&gt;</strong></del></span> <span 
class="inserted"><ins><em>so.&lt;/p&gt;
+&lt;/dd&gt;</em></ins></span>
 
 &lt;dt id="force"&gt;Isn't it wrong to force people to call
 the system &ldquo;GNU/Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#force"&gt;#force&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 It would be wrong to force them, and we don't try.  We call the system
-&ldquo;GNU/Linux&rdquo;, and we ask you to do it too.
+&ldquo;GNU/Linux&rdquo;, and we ask you to do it <span 
class="removed"><del><strong>too.</strong></del></span> <span 
class="inserted"><ins><em>too.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="whynotsue"&gt;Why not sue people who call
 the whole system &ldquo;Linux&rdquo;? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#whynotsue"&gt;#whynotsue&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 There are no legal grounds to sue them, but since we believe in
 freedom of speech, we wouldn't want to do that anyway.  We ask people
-to call the system &ldquo;GNU/Linux&rdquo; because that is the right thing to 
do.
+to call the system &ldquo;GNU/Linux&rdquo; because that is the right thing to 
<span class="removed"><del><strong>do.</strong></del></span> <span 
class="inserted"><ins><em>do.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="require"&gt;Shouldn't you put something in
     the GNU GPL to require people to call the system &ldquo;GNU&rdquo;? 
&lt;span class="anchor-reference-id"&gt;(&lt;a 
href="#require"&gt;#require&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 The purpose of the GNU GPL is to protect the users' freedom from those
 who would make proprietary versions of free software.  While it is
 true that those who call the system &ldquo;Linux&rdquo; often do things that 
limit
-the users' freedom, such as bundling non-free software with the
-GNU/Linux system or even developing non-free software for such use,
+the users' freedom, such as bundling <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software with the
+GNU/Linux system or even developing <span 
class="removed"><del><strong>non-free</strong></del></span> <span 
class="inserted"><ins><em>nonfree</em></ins></span> software for such use,
 the mere act of calling the system &ldquo;Linux&rdquo; does not, in itself, 
deny
 users their freedom.  It seems improper to make the GPL restrict what
-name people can use for the system.
+name people can use for the <span 
class="removed"><del><strong>system.</strong></del></span> <span 
class="inserted"><ins><em>system.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="BSDlicense"&gt;Since you objected to the original BSD license's
@@ -1629,17 +1663,19 @@
 it &ldquo;Linux&rdquo;, doesn't that make it right? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#somanyright"&gt;#somanyright&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
-We don't think that the popularity of an error makes it the truth.
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
+We don't think that the popularity of an error makes it the <span 
class="removed"><del><strong>truth.</strong></del></span> <span 
class="inserted"><ins><em>truth.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="knownname"&gt;Isn't it better to call the
     system by the name most users already know? &lt;span 
class="anchor-reference-id"&gt;(&lt;a 
href="#knownname"&gt;#knownname&lt;/a&gt;)&lt;/span&gt;&lt;/dt&gt;
 
 &lt;dd&gt;
+<span class="inserted"><ins><em>&lt;p&gt;</em></ins></span>
 Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo;
 includes &ldquo;Linux&rdquo;, they will recognize what you're talking
 about.  If you add &ldquo;(often erroneously referred to as
-&lsquo;Linux&rsquo;)&rdquo; once in a while, they will all understand.
+&lsquo;Linux&rsquo;)&rdquo; once in a while, they will all <span 
class="removed"><del><strong>understand.</strong></del></span> <span 
class="inserted"><ins><em>understand.&lt;/p&gt;</em></ins></span>
 &lt;/dd&gt;
 
 &lt;dt id="winning"&gt;Many people care about what's
@@ -1649,7 +1685,7 @@
 
 &lt;dd&gt;
 To care only about what's convenient or who's winning is an amoral
-approach to life.  Non-free software is an example of that amoral
+approach to life.  <span 
class="removed"><del><strong>Non-free</strong></del></span>  <span 
class="inserted"><ins><em>Nonfree</em></ins></span> software is an example of 
that amoral
 approach and thrives on it.  Thus, in the long run it would be
 self-defeating for us to adopt that approach.  We will continue
 talking in terms of right and wrong.
@@ -1658,8 +1694,7 @@
 &lt;/dd&gt;
 
 &lt;/dl&gt;
-<span class="inserted"><ins><em>&lt;/div&gt;
-&lt;/div&gt;</em></ins></span>
+<span class="inserted"><ins><em>&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;
@@ -1708,7 +1743,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2001, <span class="removed"><del><strong>2006, 2007, 
2008,</strong></del></span> <span 
class="inserted"><ins><em>2006-2008,</em></ins></span> 2010, 2011, 2013, <span 
class="removed"><del><strong>2014, 2015, 2016, 2017, 2018</strong></del></span> 
<span class="inserted"><ins><em>2014-2018, 2020, 2021</em></ins></span>
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>2001, 2006, 2007, 
2008, 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018</strong></del></span> 
<span class="inserted"><ins><em>2001-2011, 2013-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"
@@ -1719,7 +1754,7 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/06/08 08:44:38 $
+$Date: 2021/08/30 13:34:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;

Index: gnu/po/gnu-linux-faq.uk.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.uk.po,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- gnu/po/gnu-linux-faq.uk.po  31 May 2021 20:31:28 -0000      1.47
+++ gnu/po/gnu-linux-faq.uk.po  30 Aug 2021 13:34:53 -0000      1.48
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2018-02-02 17:28+0200\n"
 "Last-Translator: Andriy Bandura <andriykopanytsia@gmail.com>\n"
 "Language-Team: Ukrainian <>\n"
@@ -25,29 +25,15 @@
 msgstr ""
 "Питання про GNU/Linux - Проект GNU - Фонд 
вільного програмного забезпечення"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU/Linux FAQ"
 msgstr "ЧАП про GNU/Linux"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by Richard Stallman"
 msgstr "Річард Столмен"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
-"linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a href=\"/"
-"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Інші відомості про це питання можна 
отримати на наших сторінках <a href=\"/"
-"gnu/linux-and-gnu.html\">&ldquo;Linux і проект GNU&rdquo;</a>, <a 
href=\"/"
-"gnu/why-gnu-linux.html\">&quot;Чому &lsquo;GNU/Linux&rsquo;?&rdquo;</a> 
<a "
-"href=\"/gnu/gnu-users-never-heard-of-gnu.html\">&ldquo;Користувачі 
GNU, які "
-"ніколи не чули про GNU&rdquo;</a>."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When people see that we use and recommend the name GNU/Linux for a system "
 "that many others call just &ldquo;Linux&rdquo;, they ask many questions.  "
@@ -57,6 +43,12 @@
 "Linux&rdquo; для системи, яку багато хто назива' 
просто &ldquo;Linux&rdquo;, "
 "вони задають багато питань. Ось 
найпоширеніші з них і наші відповіді на них
:"
 
+#. type: Content of: <div><div><h3>
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "Зміст"
+
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<a href=\"#why\">Why do you call the system we use GNU/Linux and not Linux?</"
@@ -656,7 +648,28 @@
 "не суперечки про те, що чесно, а що ні. Хіба 
ви не могли б отримати більше "
 "підтримки з їхнього боку при іншому підх
оді?</a>"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our page on <a href=\"/"
+#| "gnu/linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a "
+#| "href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
+"linux-and-gnu.html\">Linux and the GNU System</a>, our page on <a href=\"/"
+"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Інші відомості про це питання можна 
отримати на наших сторінках <a href=\"/"
+"gnu/linux-and-gnu.html\">&ldquo;Linux і проект GNU&rdquo;</a>, <a 
href=\"/"
+"gnu/why-gnu-linux.html\">&quot;Чому &lsquo;GNU/Linux&rsquo;?&rdquo;</a> 
<a "
+"href=\"/gnu/gnu-users-never-heard-of-gnu.html\">&ldquo;Користувачі 
GNU, які "
+"ніколи не чули про GNU&rdquo;</a>."
+
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you call the system we use GNU/Linux and not Linux? <span class="
 "\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>"
@@ -664,7 +677,7 @@
 "Чому ви називаєте систему, якою ми 
користуємося, GNU/Linux, а не Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Most operating system distributions based on Linux as kernel are basically "
 "modified versions of the GNU operating system.  We began developing GNU in "
@@ -683,12 +696,12 @@
 "компонентів, сформувавши найбільший 
єдиний внесок у систему в цілому. "
 "Загальний план розвитку теж був нашим."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "In fairness, we ought to get at least equal mention."
 msgstr ""
 "Заради справедливості ми повинні 
отримати згадку щонайменше на рівних 
умовах."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and the GNU System</a> and <a "
 "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
@@ -701,7 +714,7 @@
 "</a>; з історією можна ознайомитися на 
сторінці <a href=\"/gnu/the-gnu-"
 "project.html\">&ldquo;Проект GNU&rdquo;</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why is the name important? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
@@ -709,7 +722,7 @@
 "Чому назва важлива? <span class=\"anchor-reference-id\"><a 
href=\"#whycare"
 "\">#whycare</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Although the developers of Linux, the kernel, are contributing to the free "
 "software community, many of them do not care about freedom.  People who "
@@ -724,7 +737,7 @@
 "насправді не грали. Потім вони надають 
поглядам цих розробників надмірне "
 "значення."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Calling the system GNU/Linux recognizes the role that our idealism played in "
 "building our community, and <a href=\"/gnu/why-gnu-linux.html\">helps the "
@@ -735,7 +748,7 @@
 "why-gnu-linux.html\">допомагати суспільству 
усвідомити практичну важливість "
 "цих ідеалів</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the real relationship between GNU and Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#what\">#what</a>)</span>"
@@ -743,7 +756,7 @@
 "Який насправді зв'язок між GNU та Linux? <span 
class=\"anchor-reference-id"
 "\"> (<a href=\"#what\">#what</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU operating system and the Linux kernel are separate software projects "
 "that do complementary jobs.  Typically they are packaged in a <a href=\"/"
@@ -754,7 +767,7 @@
 "href=\"/distros/distros.html\">дистрибутив GNU/Linux</a> та 
застосовуються "
 "разом."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How did it come about that most people call the system &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
@@ -763,7 +776,7 @@
 "Як вийшло, що більшість людей називає цю 
систему &ldquo;Linux&rdquo;?<span "
 "class=\"anchor-reference-id\"><a href=\"#howerror\">#howerror</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; is a confusion that has spread faster "
 "than the corrective information."
@@ -771,7 +784,7 @@
 "Назва системи &ldquo;Linux&rdquo;&nbsp;&mdash; це 
помилка, яка поширилася "
 "швидше, ніж її спростування."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who combined Linux with the GNU system were not aware that that's "
 "what their activity amounted to.  They focused their attention on the piece "
@@ -789,7 +802,7 @@
 "проблема, і звернулися до людей з прох
анням виправити цю практику. До того "
 "часу ця омана зайшла вже далеко."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the people who call the system &ldquo;Linux&rdquo; have never heard "
 "why that's not the right thing.  They saw others using that name and assume "
@@ -808,7 +821,7 @@
 "помилкова картина сприяє зміцненню думки 
про те, що систему слід називати "
 "&ldquo;Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Many of the questions in this file represent people's attempts to justify "
 "the name they are accustomed to using."
@@ -816,7 +829,7 @@
 "Багато питань на цій сторінці 
демонструють спроби людей "
 "виправдативикористання назви, яку вони 
звикли вживати."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we always say &ldquo;GNU/Linux&rdquo; instead of &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
@@ -824,7 +837,7 @@
 "Завжди нам слід говорити &ldquo;GNU/Linux&rdquo; 
замість &ldquo;Linux&rdquo;?"
 "<span class=\"anchor-reference-id\"><a href=\"#always\">#always</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not always&mdash;only when you're talking about the whole system.  When "
 "you're referring specifically to the kernel, you should call it &ldquo;"
@@ -834,7 +847,7 @@
 "Коли ви маєте на увазі саме ядро, вам слід 
називати його &ldquo;Linux&rdquo;"
 "&nbsp;&nbsp; назвою, яку для неї обрав 
розробник."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
 "call the whole system by the same name as the kernel.  This causes many "
@@ -850,7 +863,7 @@
 "Називаючи систему в цілому &ldquo;GNU/Linux&rdquo;, а 
ядро &ldquo;"
 "Linux&rdquo;, ви уникаєте двозначності."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Would Linux have achieved the same success if there had been no GNU? <span "
 "class=\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</"
@@ -859,7 +872,7 @@
 "Чи вдалося б Linux досягнути такого успіху, 
якби не було GNU? <span class="
 "\"anchor-reference-id\"><a href=\"#linuxalone\">#linuxalone</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In that alternative world, there would be nothing today like the GNU/Linux "
 "system, and probably no free operating system at all.  No one attempted to "
@@ -874,7 +887,7 @@
 "техніки університету Берклі, яку проект GNU 
спеціально попросив приступити "
 "до відкриття їхніх вихідних кодів."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds was partly influenced by a speech about GNU in Finland in "
 "1990.  It's possible that even without this influence he might have written "
@@ -888,7 +901,7 @@
 "(Linux) стало вільним у 1992&nbsp;році, коли Лінус 
перевипустив його під "
 "ліцензією GNU GPL. (Див. примітки до випуску 
версії 0.12)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Even if Torvalds had released Linux under some other free software license, "
 "a free kernel alone would not have made much difference to the world.  The "
@@ -900,7 +913,7 @@
 "Linux виникає з оформлення у складі більш 
великої структури, повністю "
 "вільної операційної системи&nbsp;&nbsp; GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better for the community if you did not divide people with "
 "this request? <span class=\"anchor-reference-id\">(<a href=\"#divide"
@@ -910,7 +923,7 @@
 "проханням? <span class=\"anchor-reference-id\"><a 
href=\"#divide\">#divide</"
 "a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
 "people.  We are asking them to give the GNU Project credit for the GNU "
@@ -920,7 +933,7 @@
 "людей. Ми лише просимо їх віддати належне 
проекту GNU за операційну систему "
 "GNU. Цим ми не критикуємо нікого і нікого не 
відштовхуємо."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, there are people who do not like our saying this.  Sometimes those "
 "people push us away in response.  On occasion they are so rude that one "
@@ -934,7 +947,7 @@
 "змусить нас мовчати, але людей це іноді 
розділяє, тому ми сподіваємося, що "
 "ви переконаєте їх перестати це робити."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, this is only a secondary cause of division in our community.  The "
 "largest division in the community is between people who appreciate free "
@@ -950,7 +963,7 @@
 "тими, хто вказує тільки на практичні 
вигоди і являє вільні програми тільки "
 "як ефективну схему розробки (рух за 
відкритий вихідний код)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This disagreement is not just a matter of names&mdash;it is a matter of "
 "differing basic values.  It is essential for the community to see and think "
@@ -967,7 +980,7 @@
 "відкритий вихідний код&rsquo; не передає 
поняття &lsquo;вільна "
 "програма&rsquo;&rdquo;</a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The disagreement over values partially aligns with the amount of attention "
 "people pay to the GNU Project's role in our community.  People who value "
@@ -992,7 +1005,7 @@
 "переконаємо усіх інших (що буде нелегко) 
чи будемо повністю переможені "
 "(будемо сподіватися, що цього не 
станеться)."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Doesn't the GNU project support an individual's free speech rights to call "
 "the system by any name that individual chooses? <span class=\"anchor-"
@@ -1002,7 +1015,7 @@
 "називати систему так, як вона хоче? <span 
class=\"anchor-reference-id\"><a "
 "href=\"#freespeech\">#freespeech</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Yes, indeed, we believe you have a free speech right to call the operating "
 "system by any name you wish.  We ask that people call it GNU/Linux as a "
@@ -1016,7 +1029,7 @@
 "проекту GNU, популяризувати цінності 
свободи, які відстоює GNU, а також "
 "проінформувати інших людей, що ці 
цінності свободи дали життя цій системі."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since everyone knows the role of GNU in developing the system, doesn't the "
 "&ldquo;GNU/&rdquo; in the name go without saying? <span class=\"anchor-"
@@ -1026,7 +1039,7 @@
 "слів, що мова йде про &ldquo;GNU/&rdquo;?  <span 
class=\"anchor-reference-id"
 "\">(<a href=\"#everyoneknows\">#everyoneknows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Experience shows that the system's users, and the computer-using public in "
 "general, often know nothing about the GNU system.  Most articles about the "
@@ -1040,7 +1053,7 @@
 "Стаття <a 
href=\"/gnu/gnu-users-never-heard-of-gnu.html\">&ldquo;Користувачі "
 "GNU, які ніколи не чули про GNU&rdquo;</a> 
роз'яснює це питання докладніше."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who say this are probably geeks thinking of the geeks they know.  "
 "Geeks often do know about GNU, but many have a completely wrong idea of what "
@@ -1053,7 +1066,7 @@
 "набір <a href=\"#tools\">&ldquo;інструментів&rdquo;</a> 
або проект по "
 "розробці таких інструментів."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The wording of this question, which is typical, illustrates another common "
 "misconception.  To speak of &ldquo;GNU's role&rdquo; in developing something "
@@ -1067,7 +1080,7 @@
 "операційна система. У таких випадках 
доречно було б говорити про роль "
 "проекту GNU в тій чи іншій діяльності, а не 
про GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since I know the role of GNU in this system, why does it matter what name I "
 "use? <span class=\"anchor-reference-id\">(<a href="
@@ -1077,7 +1090,7 @@
 "назвою я користуюся? <span class=\"anchor-reference-id\"><a 
href="
 "\"#everyoneknows2\">#everyoneknows2</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your words don't reflect your knowledge, you don't teach others.  Most "
 "people who have heard of the GNU/Linux system think it is &ldquo;"
@@ -1090,7 +1103,7 @@
 "збиралися робити &ldquo;з відкритим вихідним 
кодом&rdquo;. Якщо ви їм не "
 "розповісте правду, то хто розповість?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't shortening &ldquo;GNU/Linux&rdquo; to &ldquo;Linux&rdquo; just like "
 "shortening &ldquo;Microsoft Windows&rdquo; to &ldquo;Windows&rdquo;? <span "
@@ -1100,7 +1113,7 @@
 "що скорочення &ldquo;Microsoft Windows&rdquo; і 
&ldquo;Windows&rdquo;? <span "
 "class=\"anchor-reference-id\"><a href=\"#windows\">#windows</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It's useful to shorten a frequently-used name, but not if the abbreviation "
 "is misleading."
@@ -1108,7 +1121,7 @@
 "Часто вживані назви корисно скорочувати, 
але тільки не у випадку, коли "
 "скорочення вводить в оману."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Almost everyone in developed countries really does know that the &ldquo;"
 "Windows&rdquo; system is made by Microsoft, so shortening &ldquo;Microsoft "
@@ -1123,7 +1136,7 @@
 "&ldquo;Linux&rdquo; дає неправильне уявлення про 
те, звідки походить ця "
 "система."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The question is itself misleading because GNU and Microsoft are not the same "
 "kind of thing.  Microsoft is a company; GNU is an operating system."
@@ -1132,7 +1145,7 @@
 "об'єкти різного роду. Microsoft&nbsp;&mdash; це 
компанія; GNU&nbsp;&mdash; "
 "це операційна система."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't GNU a collection of programming tools that were included in Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
@@ -1141,7 +1154,7 @@
 "увійшли в Linux? <span class=\"anchor-reference-id\"><a href=\"#tools"
 "\">#tools</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "People who think that Linux is an entire operating system, if they hear "
 "about GNU at all, often get a wrong idea of what GNU is.  They may think "
@@ -1160,7 +1173,7 @@
 "назва операційної системи, з працею 
вкладається в ту систему понять, у якій "
 "операційну систему називають &ldquo;Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Project was named after the GNU operating system&mdash;it's the "
 "project to develop the GNU system.  (See <a href=\"/gnu/initial-announcement."
@@ -1170,7 +1183,7 @@
 "системи GNU. (Див. <a 
href=\"/gnu/initial-announcement.html\">попереднє "
 "оголошення 1983&nbsp;</a>.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We developed programs such as GCC, GNU Emacs, GAS, GLIBC, BASH, etc., "
 "because we needed them for the GNU operating system.  GCC, the GNU Compiler "
@@ -1185,7 +1198,7 @@
 "розробили для системи GNU також Ghostscript, 
вікно gnucash за допомогою "
 "пункту GNU Chess та GNOME."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the difference between an operating system and a kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
@@ -1193,7 +1206,7 @@
 "У чому відмінність між операційною 
системою і ядром? <span class=\"anchor-"
 "reference-id\"><a href=\"#osvskernel\">#osvskernel</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "An operating system, as we use the term, means a collection of programs that "
 "are sufficient to use the computer to do a wide variety of jobs.  A general "
@@ -1206,7 +1219,7 @@
 "призначення повинна підтримувати всі 
типи завдань, які багато користувачів "
 "захочуть вирішувати."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The kernel is one of the programs in an operating system&mdash;the program "
 "that allocates the machine's resources to the other programs that are "
@@ -1216,7 +1229,7 @@
 "програма, яка виділяє ресурси іншим 
працюючим програмам. Ядро також "
 "займається запуском і зупинкою інших 
програм."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "To confuse matters, some people use the term &ldquo;operating system&rdquo; "
 "to mean &ldquo;kernel&rdquo;.  Both uses of the term go back many years.  "
@@ -1237,7 +1250,7 @@
 "себе навіть ігри. Оскільки ми хотіли, щоб 
GNU була операційна система типу "
 "Unix, ми вживаємо термін &ldquo;операційна 
система&rdquo; в тому ж сенсі."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the time when people speak of the &ldquo;Linux operating "
 "system&rdquo; they are using &ldquo;operating system&rdquo; in the same "
@@ -1255,7 +1268,7 @@
 "будь ласка, говоріть також &ldquo;ядро&rdquo;, 
щоб уникнути непорозумінь з "
 "приводу того, яку саме сукупність програм 
ви маєте на увазі."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
@@ -1267,7 +1280,7 @@
 "&ldquo;операційна система&rdquo;&nbsp;&nbsp; чудово. 
Тоді ви будете говорити "
 "про дистрибутиви системи GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The kernel of a system is like the foundation of a house.  How can a house "
 "be almost complete when it doesn't have a foundation? <span class=\"anchor-"
@@ -1277,7 +1290,7 @@
 "майже готовим, якщо у нього немає 
фундаменту? <span class=\"anchor-reference-"
 "id\"><a href=\"#house\">#house</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "A kernel is not much like the foundation of a house because building an "
 "operating system is not much like building a house."
@@ -1285,7 +1298,7 @@
 "Ядро не дуже схоже на фундамент будинку, 
тому що побудова операційної "
 "системи не дуже схожа на спорудження 
будинку."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A house is built from lots of little general parts that are cut and put "
 "together in situ.  They have to be put together from the bottom up.  Thus, "
@@ -1297,7 +1310,7 @@
 "не закладено фундамент, то не побудовано і 
ніякої суттєвої частини; все, що "
 "у вас є&nbsp;&mdash; це яма в землі."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "By contrast, an operating system consists of complex components that can be "
 "developed in any order.  When you have developed most of the components, "
@@ -1313,7 +1326,7 @@
 "було вже на орбіті, і бракувало тільки 
одного важливого модуля, це було б "
 "схоже на систему GNU 1992&nbsp;році."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't the kernel the brain of the system? <span class=\"anchor-reference-id"
 "\">(<a href=\"#brain\">#brain</a>)</span>"
@@ -1321,7 +1334,7 @@
 "Хіба ядро&nbsp;&mdash; це не мозок системи? <span 
class=\"anchor-reference-id"
 "\"><a href=\"#brain\">#brain</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A computer system is not much like a human body, and no part of it plays a "
 "role comparable to that of the brain in a human."
@@ -1329,7 +1342,7 @@
 "Обчислювальна система не дуже схожа на 
людський організм, і жодна її частина "
 "не грає роль, порівнянну з роллю людського 
мозку в організмі."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't writing the kernel most of the work in an operating system? <span "
 "class=\"anchor-reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</"
@@ -1339,18 +1352,18 @@
 "операційної системи? <span class=\"anchor-reference-id\"><a 
href="
 "\"#kernelmost\">#kernelmost</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "No, many components take a lot of work."
 msgstr "Ні, багато компонентів вимагають 
великого обсягу робіт."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "An operating system requires a kernel.  Since the GNU Project didn't develop "
 "a kernel, how can the system be GNU?<span class=\"anchor-reference-id\">(<a "
 "href=\"#nokernel\">#nokernel</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The people who argue that way for calling the system &ldquo;Linux&rdquo; are "
 "using a double standard.  An operating system requires compilers, editors, "
@@ -1359,20 +1372,20 @@
 "any of those, how can the system be &ldquo;Linux&rdquo;?"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "That standard is too strict, not the right way to judge the contributions of "
 "any contributor."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds made an important contribution to the operating system we "
 "use; the GNU Project started earlier and contributed much more.  The name "
 "&ldquo;GNU/Linux&rdquo; gives credit to each."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How can GNU be an operating system, if I can't get something called &ldquo;"
 "GNU&rdquo; and install it? <span class=\"anchor-reference-id\">(<a href="
@@ -1382,7 +1395,7 @@
 "щось під назвою &ldquo;GNU&rdquo;? <span 
class=\"anchor-reference-id\">(<a "
 "href=\"#notinstallable\">#notinstallable</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Many <a href=\"/distros/distros.html\"> packaged and installable versions of "
 "GNU</a> are available.  None of them is called simply &ldquo;GNU&rdquo;, but "
@@ -1392,7 +1405,7 @@
 "підготовлених до встановлення</a>. Жодна з 
них не називається просто &ldquo;"
 "GNU&rdquo;, але вони в основі своїй 
представляють саме GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We expected to release the GNU system packaged for installation, but this "
 "plan was overtaken by events: in 1992 others were already packaging GNU "
@@ -1412,7 +1425,7 @@
 "дистрибутив просто &ldquo;GNU&rdquo;, тому що так 
збиралися називати версію "
 "системи з ядром GNU Hurd&nbsp;&nbsp; яка до того 
часу ще не була готова."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Hurd kernel never became sufficiently ready; we only recommend it to "
 "those interested in working on it.  So we never packaged GNU with the GNU "
@@ -1423,7 +1436,7 @@
 "дистрибутив GNU з ядром GNU Hurd. Однак Debian 
випустив дистрибутив цієї "
 "комбінації як Debian GNU/Hurd."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are now developing an advanced Scheme-based package manager called Guix "
 "and a complete system distribution based on it called the <a href=\"/"
@@ -1435,7 +1448,7 @@
 "software/guix\">системний дистрибутив Guix</a> або 
GuixSD. Це передбачає "
 "перепакування істотної частини системи 
GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We never took the last step of packaging GNU under the name &ldquo;"
 "GNU&rdquo;, but that doesn't alter what kind of thing GNU is.  GNU is an "
@@ -1445,7 +1458,7 @@
 "&ldquo;GNU&rdquo;, але це не змінює суті того, чим є 
GNU. GNU&nbsp;&mdash; "
 "операційна система."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "We're calling the whole system after the kernel, Linux.  Isn't it normal to "
 "name an operating system after a kernel? <span class=\"anchor-reference-id\">"
@@ -1455,7 +1468,7 @@
 "систему не називають зазвичай так само, як 
ядро? <span class=\"anchor-"
 "reference-id\"><a href=\"#afterkernel\">#afterkernel</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "That practice seems to be very rare&mdash;we can't find any examples other "
 "than the misuse of the name &ldquo;Linux&rdquo;.  Normally an operating "
@@ -1471,7 +1484,7 @@
 "назви&nbsp;&nbsp; замість цього люди кажуть 
&ldquo;ядро такої системи&rdquo; "
 "&ldquo;таке ядро&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Because those two constructions are used synonymously, the expression &ldquo;"
 "the Linux kernel&rdquo; can easily be misunderstood as meaning &ldquo;the "
@@ -1485,7 +1498,7 @@
 "ядро. Можливості такого невірного 
розуміння можна уникнути, якщо говорити "
 "або писати &ldquo;ядро (Linux)&rdquo; &ldquo;Linux 
(ядро)&rdquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can another system have &ldquo;the feel of Linux&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
@@ -1493,7 +1506,7 @@
 "Чи може інша система дати &ldquo;відчуття 
Linux&rdquo;? <span class=\"anchor-"
 "reference-id\"><a href=\"#feel\">#feel</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is no such thing as the &ldquo;feel of Linux&rdquo; because Linux has "
 "no user interfaces.  Like any modern kernel, Linux is a base for running "
@@ -1507,7 +1520,7 @@
 "системи. Взаємодія людини з GNU/Linux завжди 
здійснюється через інші "
 "програми, а &ldquo;відчуття&rdquo; приходить від 
них."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  How about "
 "recommending a shorter name? <span class=\"anchor-reference-id\">(<a href="
@@ -1517,7 +1530,7 @@
 "Не запропонуєте ви що-небудь коротше? <span 
class=\"anchor-reference-id\"><a "
 "href=\"#long\">#long</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "For a while we tried the name &ldquo;LiGNUx&rdquo;, which combines the words "
 "&ldquo;GNU&rdquo; and &ldquo;Linux&rdquo;.  The reaction was very bad.  "
@@ -1527,7 +1540,7 @@
 "поєднує слова &ldquo;GNU&rdquo; і &ldquo;Linux&rdquo;. Р
еакція була різко "
 "негативною. Люди набагато краще 
сприймають назву &ldquo;GNU/Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
 "call it &ldquo;GNU/Linux&rdquo; <a href=\"#justgnu\"> for the reasons given "
@@ -1537,7 +1550,7 @@
 "однак ми називаємо її &ldquo;GNU/Linux&rdquo; <a 
href=\"#justgnu\"> з "
 "причин, викладених нижче</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How about calling the system &ldquo;GliNUx&rdquo; (instead of &ldquo;GNU/"
 "Linux&rdquo;)? <span class=\"anchor-reference-id\">(<a href="
@@ -1546,7 +1559,7 @@
 "Чому ви пишете &ldquo;GliNUx&rdquo; замість &ldquo;GNU і 
ОС Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#long1\">#long1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The name &ldquo;GNU&rdquo; does not visibly appear in &ldquo;Glinux,&rdquo; "
 "so most people would not notice it is there.  Even if it is capitalized as "
@@ -1558,7 +1571,7 @@
 "(&ldquo;GliNUx&rdquo;) широкий загал людей не буде 
усвідомлювати, що тут "
 "міститься посилання на GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be comparable to writing &ldquo;GNU/Linux,&rdquo; but putting "
 "&ldquo;GNU/&rdquo; in print so small that most people could not read it."
@@ -1566,7 +1579,7 @@
 "Це порівнюване з тим, якби ми писали 
&ldquo;GNU/Linux&rdquo;, але &ldquo;GNU/"
 "&rdquo; набирали б таким дрібним шрифтом, що 
люди не могли б це прочитати."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  Why should "
 "I go to the trouble of saying &ldquo;GNU/&rdquo;? <span class=\"anchor-"
@@ -1576,7 +1589,7 @@
 "Навіщо мені мучитися і говорити &ldquo;GNU&rdquo;? 
<span class=\"anchor-"
 "reference-id\"><a href=\"#long2\">#long2</a></span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
 "the system that we developed, can't you take one second to recognize our "
@@ -1586,7 +1599,7 @@
 "яку ми розробили, хіба ви не можете 
приділити одну секунду тому, щоб "
 "висловити визнання нашої роботи?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Unfortunately, &ldquo;GNU/Linux&rdquo; is five syllables. People won't use "
 "such a long term. Shouldn't you find a shorter one? <span class=\"anchor-"
@@ -1596,7 +1609,7 @@
 "будуть вживати таке довге слово. Не знайти 
вам що-небудь коротше? <span "
 "class=\"anchor-reference-id\"><a href=\"#long3\">#long3</a></span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, &ldquo;GNU/Linux&rdquo; is only four syllables.  &ldquo;"
 "Unfortunately&rdquo; is five syllables, yet people show no sign of "
@@ -1606,28 +1619,28 @@
 "&ldquo;На жаль&rdquo;&nbsp;&mdash; це п'ять складів, і 
все-таки ми не "
 "бачимо, щоб люди вживали це слово з неох
отою."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Stallman doesn't ask us to call him &ldquo;Richard Matthew Stallman&rdquo; "
 "every the time.  So why ask us to say &ldquo;GNU/Linux&rdquo; every time? "
 "<span class=\"anchor-reference-id\">(<a href=\"#long4\">#long4</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Omitting &ldquo;Matthew&rdquo; does not misrepresent anything important "
 "about Stallman's nature, origin, ideas or purpose.  Omitting &ldquo;"
 "GNU&rdquo; does misrepresent those things about the GNU/Linux system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is an example of a frequent way of hiding a fallacy: to bury it inside "
 "a misleading analogy.  A better analogy would be, &ldquo;Why shouldn't we "
 "call Stallman &lsquo;Torvalds&rsquo;?&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since Linux is a secondary contribution, would it be false to the facts to "
 "call the system simply &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id"
@@ -1637,7 +1650,7 @@
 "неправильно називати систему просто 
&ldquo;GNU&rdquo;? <span class=\"anchor-"
 "reference-id\"><a href=\"#justgnu\">#justgnu</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would not be false to the facts, but it is not the best thing to do.  "
 "Here are the reasons we call that system version &ldquo;GNU/Linux&rdquo; "
@@ -1646,7 +1659,7 @@
 "Це не суперечило фактам, але це не кращий 
варіант. Ось причини, за яким ми "
 "називаємо систему &ldquo;GNU/Linux&rdquo;, а не 
&ldquo;GNU&rdquo;:"
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It's not exactly GNU&mdash;it has a different kernel (that is, Linux).  "
 "Distinguishing GNU/Linux from GNU is useful."
@@ -1654,7 +1667,7 @@
 "Це не зовсім GNU&nbsp;&mdash; у неї інше ядро 
(власне, Linux). Розрізняти "
 "GNU/Linux і GNU все ж корисно."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It would be ungentlemanly to ask people to <em>stop</em> giving any credit "
 "to Linus Torvalds.  He did write an important component of the system.  We "
@@ -1674,7 +1687,7 @@
 "шанобливо і відкрито, а не намагаємося 
применшити заслуги Лінуса і його "
 "внесок в систему."
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
 "&ldquo;GNU&rdquo; they may simply not recognize we're talking about the same "
@@ -1686,7 +1699,7 @@
 "ми говоримо. Коли ж ми говоримо 
&ldquo;GNU/Linux&rdquo;, вони можуть "
 "зв'язати це з тим, про що вони вже чули."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "I would have to pay a fee if I use &ldquo;Linux&rdquo; in the name of a "
 "product, and that would also apply if I say &ldquo;GNU/Linux&rdquo;.  Is it "
@@ -1700,7 +1713,7 @@
 "не платити за це? <span class=\"anchor-reference-id\"><a 
href=\"#trademarkfee"
 "\">#trademarkfee</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There's nothing wrong in calling the system &ldquo;GNU&rdquo;; basically, "
 "that's what it is.  It is nice to give Linus Torvalds a share of the credit "
@@ -1710,7 +1723,7 @@
 "суті, це так і є. Просто було б добре 
віддати належне і Лінусу Торвальдсу, "
 "але ви зовсім не зобов'язані платити за 
право робити це."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "So if you want to refer to the system simply as &ldquo;GNU&rdquo;, to avoid "
 "paying the fee for calling it &ldquo;Linux&rdquo;, we won't criticize you."
@@ -1718,7 +1731,7 @@
 "Тому якщо ви захочете назвати систему 
просто &ldquo;GNU&rdquo;, щоб не "
 "платити за те, що називаєте її &ldquo;Linux&rdquo;, 
ми вас не засудимо."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today; it includes "
 "TeX, X11, Apache, Perl, and many more programs.  Don't your arguments imply "
@@ -1732,7 +1745,7 @@
 "такої довгої назви, що це був би абсурд.) 
<span class=\"anchor-reference-id"
 "\"><a href=\"#many\">#many</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "What we say is that you ought to give the system's principal developer a "
 "share of the credit.  The principal developer is the GNU Project, and the "
@@ -1742,7 +1755,7 @@
 "системи. Провідний розробник у даному 
випадку&nbsp;&mdash; це проект GNU, а "
 "система, в основному, GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you feel even more strongly about giving credit where it is due, you "
 "might feel that some secondary contributors also deserve credit in the "
@@ -1760,7 +1773,7 @@
 "просто волаю про згадку, і хочете писати 
&ldquo;GNU/Linux/Perl&rdquo;&nbsp;"
 "&mdash; так і робіть."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Since a long name such as GNU/X11/Apache/Linux/TeX/Perl/Python/FreeCiv "
 "becomes absurd, at some point you will have to set a threshold and omit the "
@@ -1774,7 +1787,7 @@
 "вірного місця, де провести цю риску, немає, 
тому де б ви її не провели, ми "
 "не станемо з цим сперечатися."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Different threshold levels would lead to different choices of name for the "
 "system.  But one name that cannot result from concerns of fairness and "
@@ -1789,14 +1802,14 @@
 "тільки за один із другорядних вкладів 
(Linux), у той час, як головний внесок "
 "(GNU) ігнорується."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "systemd plays an important role in the GNU/Linux system as it is today; are "
 "we obligated to call it GNU/systemd/Linux? <span class=\"anchor-reference-id"
 "\">(<a href=\"#others\">#others</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "systemd is a fairly important component, but not as important as the kernel "
 "(Linux), nor as important as the basis of the system as a whole (GNU).  "
@@ -1804,7 +1817,7 @@
 "system &ldquo;GNU/systemd/Linux&rdquo;, there is nothing wrong with doing so."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today, but they don't "
 "insist on calling it XYZ/Linux.  Why should we treat GNU specially? <span "
@@ -1815,7 +1828,7 @@
 "повинні робити виняток для GNU? <span 
class=\"anchor-reference-id\"><a href="
 "\"#others\">#others</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Thousands of projects have developed programs commonly included in today's "
 "GNU/Linux systems.  They all deserve credit for their contributions, but "
@@ -1827,7 +1840,7 @@
 "розробниками системи в цілому, тому вони 
не просять, щоб на них посилалися, "
 "як на одного з основних розробників."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is different because it is more than just a contributed program, more "
 "than just a collection of contributed programs.  GNU is the framework on "
@@ -1837,7 +1850,7 @@
 "програма і навіть більше, ніж набір 
залучених програм. GNU&nbsp;&mdash; це "
 "той каркас, на якому була побудована вся 
система."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "GNU is a small fraction of the system nowadays, so why should we mention it? "
 "<span class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</"
@@ -1847,7 +1860,7 @@
 "згадувати про неї? <span class=\"anchor-reference-id\"><a 
href=\"#allsmall"
 "\">#allsmall</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In 2008, we found that GNU packages made up 15% of the &ldquo;main&rdquo; "
 "repository of the gNewSense GNU/Linux distribution.  Linux made up 1.5%.  So "
@@ -1859,7 +1872,7 @@
 "Отож, цей аргумент у ще більшій мірі 
справедливий щодо назви &ldquo;"
 "Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is a small fraction of the system nowadays, and Linux is an even smaller "
 "fraction.  But they are the system's core; the system was made by combining "
@@ -1869,7 +1882,7 @@
 "ще менша. Але вони&nbsp;&nbsp; кістяк системи; 
система була створена їхнім "
 "об'єднанням. Тому назва &ldquo;GNU/Linux&rdquo; 
залишається доречною."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many companies contributed to the system as it is today; doesn't that mean "
 "we ought to call it GNU/Red&nbsp;Hat/Novell/Linux? <span class=\"anchor-"
@@ -1880,7 +1893,7 @@
 "Linux&rdquo;? <span class=\"anchor-reference-id\"><a href=\"#manycompanies"
 "\">#manycompanies</a></span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is not comparable to Red Hat or Novell; it is not a company, or an "
 "organization, or even an activity.  GNU is an operating system.  (When we "
@@ -1894,7 +1907,7 @@
 "системи GNU.) Система GNU/Linux заснована на GNU, і 
саме тому &ldquo;"
 "GNU&rdquo; повинно бути присутнім в її назві."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Much of those companies' contribution to the GNU/Linux system lies in the "
 "code they have contributed to various GNU packages including GCC and GNOME.  "
@@ -1906,7 +1919,7 @@
 "GNU/Linux&rdquo;, ви віддаєте належне і цим 
компаніям, поряд з іншими "
 "розробниками GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
@@ -1916,7 +1929,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean "
@@ -1928,7 +1941,7 @@
 "означати або &ldquo;версія Linux з GNU&rdquo;, або 
&ldquo;Linux, пакет "
 "проекту GNU&rdquo;. Жодне з цих значень не 
відповідає ситуації."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is not a GNU package; that is, it wasn't developed under the GNU "
 "Project's aegis or contributed specifically to the GNU Project.  Linus "
@@ -1940,14 +1953,24 @@
 "Торвальдс написав Linux незалежно, як свій 
власний проект. Отож, значення "
 "&ldquo;Linux, пакет проекту GNU&rdquo; невірно."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "We're not talking about a distinct GNU version of Linux, the kernel.  The "
+#| "free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/";
+#| "project/linux\">separate version of Linux</a>, since the &ldquo;"
+#| "standard&rdquo; version contains non-free firmware &ldquo;blobs&rdquo;.  "
+#| "If this were part of the GNU Project, it could be considered &ldquo;GNU "
+#| "Linux&rdquo;; but we would not want to call it that, because it would be "
+#| "too confusing."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
-"free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/project/";
-"linux\">separate version of Linux</a>, since the &ldquo;standard&rdquo; "
-"version contains non-free firmware &ldquo;blobs&rdquo;.  If this were part "
-"of the GNU Project, it could be considered &ldquo;GNU Linux&rdquo;; but we "
-"would not want to call it that, because it would be too confusing."
+"free GNU/Linux distros do have a <a href=\"https://directory.fsf.org/wiki/";
+"Linux-libre\">separate version of Linux</a>, since the &ldquo;"
+"standard&rdquo; version contains nonfree firmware &ldquo;blobs&rdquo;.  If "
+"this were part of the GNU Project, it could be considered &ldquo;GNU "
+"Linux&rdquo;; but we would not want to call it that, because it would be too "
+"confusing."
 msgstr ""
 "Ми не маємо на увазі особливу версію Linux 
(ядра) в проекті GNU. У вільних "
 "дистрибутиви GNU/Linux <a 
href=\"http://directory.fsf.org/project/linux";
@@ -1956,7 +1979,7 @@
 "проекту GNU, її можна було б розглядати як 
&ldquo;GNU Linux&rdquo;; але ми "
 "не хотіли б називати її так, тому що це 
призвело б до великої плутанини."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We're talking about a version of GNU, the operating system, distinguished by "
 "having Linux as the kernel.  A slash fits the situation because it means "
@@ -1969,7 +1992,7 @@
 "Вивід&rdquo;). Ця система&nbsp;&nbsp; комбінація GNU 
і Linux; звідси і "
 "&ldquo;GNU/Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are other ways to express &ldquo;combination&rdquo;.  If you think "
 "that a plus-sign is clearer, please use that.  In French, a hyphen is clear: "
@@ -1981,20 +2004,20 @@
 "мовою зрозуміліший дефіс: &ldquo;GNU-Linux&rdquo;. 
Іспанською ми іноді "
 "говоримо &ldquo;GNU con Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How is the name &ldquo;GNU/Linux&rdquo; pronounced? <span class=\"anchor-"
 "reference-id\">(<a href=\"#pronounce\">#pronounce</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please pronounce it as &ldquo;GNU slash Linux.&rdquo; If you don't pronounce "
 "the slash, people will think you are saying &ldquo;GNU Linux,&rdquo; which "
 "is <a href=\"#whyslash\">not a suitable name for the combination</a>."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 #, fuzzy
 #| msgid ""
 #| "Why do you write &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU "
@@ -2009,7 +2032,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 #, fuzzy
 #| msgid ""
 #| "Following the rules of English, in the construction &ldquo;GNU "
@@ -2027,14 +2050,14 @@
 "означати або &ldquo;версія Linux з GNU&rdquo;, або 
&ldquo;Linux, пакет "
 "проекту GNU&rdquo;. Жодне з цих значень не 
відповідає ситуації."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;GNU/Emacs&rdquo; would mean the combination of GNU, the operating "
 "system, and the program Emacs.  That doesn't fit this program, so &ldquo;GNU/"
 "Emacs&rdquo; is the wrong way to refer to it."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why &ldquo;GNU/Linux&rdquo; rather than &ldquo;Linux/GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
@@ -2042,7 +2065,7 @@
 "Чому &ldquo;GNU/Linux&rdquo;, а не &ldquo;Linux/GNU&rdquo;? <span 
class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is right and proper to mention the principal contribution first.  The GNU "
 "contribution to the system is not only bigger than Linux and prior to Linux, "
@@ -2052,7 +2075,7 @@
 "Внесок GNU в систему не тільки більше, ніж 
Linux, і був проведений раніше, "
 "ніж Linux. Насправді все це рух почали ми."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the lowest "
 "level of the system and GNU fills technically higher levels."
@@ -2060,7 +2083,7 @@
 "Крім того, назва &ldquo;GNU/Linux&rdquo; відображає 
той факт, що Linux "
 "становить найнижчий рівень, а GNU заповнює 
технічно вищі рівіи."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
 "lot better than what people usually do, which is to omit GNU entirely and "
@@ -2070,7 +2093,7 @@
 "це набагато краще, ніж те, що люди зазвичай 
роблять&nbsp;&mdash; вони "
 "повністю ігнорують GNU і створюють 
видимість, що вся система і є Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
 "say anything about what the system consists of.  Why shouldn't they call it "
@@ -2082,7 +2105,7 @@
 "можуть називати його так, як їм 
заманеться?<span class=\"anchor-reference-id"
 "\"><a href=\"#distronames0\">#distronames0</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling a system &ldquo;Foobar Linux&rdquo; implies that it's a flavor of "
 "&ldquo;Linux,&rdquo; and people <a href=\"#distronames\">understand it that "
@@ -2091,7 +2114,7 @@
 "Назва &ldquo;Foobar Linux&rdquo; припускає, що це 
різновид &ldquo;"
 "Linux&rdquo;, і люди <a href=\"#distronames\">сприймають це 
таким чином</a>."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If they called a GNU/Linux distro &ldquo;Foobar BSD,&rdquo; you would call "
 "that a mistake.  &ldquo;This system is not BSD,&rdquo; you would tell them.  "
@@ -2101,7 +2124,7 @@
 "назвали б це помилкою. Ви сказали їм: 
&ldquo;Ця система не BSD&rdquo;. Так "
 "от, це і не Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro is called &ldquo;Foobar Linux&rdquo;; doesn't that show it's "
 "really Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
@@ -2111,7 +2134,7 @@
 "що це дійсно Linux? <span class=\"anchor-reference-id\"><a href="
 "\"#distronames\">#distronames</a></span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It means that the people who make the &ldquo;Foobar Linux&rdquo; distro are "
 "repeating the common mistake. We appreciate that distributions like Debian, "
@@ -2125,7 +2148,7 @@
 "частиною свого офіційного назви, і ми 
сподіваємося, що якщо ви берете участь "
 "у роботі іншого дистрибутиву, то ви будете 
закликати його до цього."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's official name is &ldquo;Foobar Linux&rdquo;; isn't it wrong to "
 "call the distro anything but &ldquo;Foobar Linux&rdquo;? <span class="
@@ -2136,7 +2159,7 @@
 "class=\"anchor-reference-id\"><a href=\"#distronames1\">#distronames1</a></"
 "span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When they spread misinformation by changing &ldquo;GNU&rdquo; to &ldquo;"
 "Linux&rdquo;, and call their version of it &ldquo;Foobar Linux&rdquo;, it's "
@@ -2147,7 +2170,7 @@
 "яку ми розробили, хіба ви не можете 
приділити одну секунду тому, щоб "
 "висловити визнання нашої роботи?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be more effective to ask companies such as Mandrake, Red Hat and "
 "IBM to call their distributions &ldquo;GNU/Linux&rdquo; rather than asking "
@@ -2159,7 +2182,7 @@
 "звертатися до окремих людей? <span 
class=\"anchor-reference-id\"><a href="
 "\"#companies\">#companies</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It isn't a choice of one or the other&mdash;we ask companies and "
 "organizations and individuals to help spread the word about this.  In fact, "
@@ -2178,7 +2201,7 @@
 "Linux&rsquo;&rdquo;. Іншими словами, цій компанії 
була байдужа правильна "
 "назва."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We can't make them do this right, but we're not the sort to give up just "
 "because the road isn't easy.  You may not have as much influence at your "
@@ -2192,7 +2215,7 @@
 "змінити ситуацію настільки, що компаніям 
вигідніше називати її &ldquo;GNU/"
 "Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to reserve the name &ldquo;GNU/Linux&rdquo; for "
 "distributions that are purely free software? After all, that is the ideal of "
@@ -2203,15 +2226,26 @@
 "повністю вільних дистрибутивів? Зрештою, 
це ж і є ідеал GNU. <span class="
 "\"anchor-reference-id\"><a href=\"#reserve\">#reserve</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+#, fuzzy
+#| msgid ""
+#| "The widespread practice of adding non-free software to the GNU/Linux "
+#| "system is a major problem for our community.  It teaches the users that "
+#| "non-free software is ok, and that using it is part of the spirit of "
+#| "&ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part "
+#| "of their mission to help users use non-free add-ons, and may even invite "
+#| "salesmen to come and make sales pitches for them.  They adopt goals such "
+#| "as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them "
+#| "use non-free applications and drivers), or making the system more popular "
+#| "even at the cost of freedom."
 msgid ""
-"The widespread practice of adding non-free software to the GNU/Linux system "
-"is a major problem for our community.  It teaches the users that non-free "
+"The widespread practice of adding nonfree software to the GNU/Linux system "
+"is a major problem for our community.  It teaches the users that nonfree "
 "software is ok, and that using it is part of the spirit of &ldquo;"
 "Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of their "
-"mission to help users use non-free add-ons, and may even invite salesmen to "
+"mission to help users use nonfree add-ons, and may even invite salesmen to "
 "come and make sales pitches for them.  They adopt goals such as &ldquo;"
-"helping the users&rdquo; of GNU/Linux (including helping them use non-free "
+"helping the users&rdquo; of GNU/Linux (including helping them use nonfree "
 "applications and drivers), or making the system more popular even at the "
 "cost of freedom."
 msgstr ""
@@ -2226,11 +2260,11 @@
 "вільних програм і драйверів) або 
популяризація системи навіть ціною втрати "
 "свободи."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The question is how to try to change this."
 msgstr "Питання в тому, що робити, щоб змінити 
це."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Given that most of the community which uses GNU with Linux already does not "
 "realize that's what it is, for us to disown these adulterated versions, "
@@ -2245,13 +2279,22 @@
 "не дійшло. Вони просто заперечили б, що 
вони, насамперед, ніколи не вважали "
 "ці системи системами GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The way to lead these users to see a connection with freedom is exactly "
+#| "the opposite: to inform them that all these system versions <em>are</em> "
+#| "versions of GNU, that they all are based on a system that exists "
+#| "specifically for the sake of the users' freedom.  With this "
+#| "understanding, they can start to recognize the distributions that include "
+#| "non-free software as perverted, adulterated versions of GNU, instead of "
+#| "thinking they are proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgid ""
 "The way to lead these users to see a connection with freedom is exactly the "
 "opposite: to inform them that all these system versions <em>are</em> "
 "versions of GNU, that they all are based on a system that exists "
 "specifically for the sake of the users' freedom.  With this understanding, "
-"they can start to recognize the distributions that include non-free software "
+"they can start to recognize the distributions that include nonfree software "
 "as perverted, adulterated versions of GNU, instead of thinking they are "
 "proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgstr ""
@@ -2263,7 +2306,7 @@
 "зіпсовані версії GNU замість того, щоб 
думати, що це пристойні і допустимі "
 "&ldquo;версії Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is very useful to start GNU/Linux User Groups, which call the system GNU/"
 "Linux and adopt the ideals of the GNU Project as a basis for their "
@@ -2281,7 +2324,7 @@
 "зосереджені на більш поверхневих цілях, 
мають повне право дотримуватися "
 "своєї позиції, але не дайте їм повести за 
собою і вас!"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not make a GNU distribution of Linux (sic) and call that GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
@@ -2291,7 +2334,7 @@
 "його &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id\">(<a 
href="
 "\"#gnudist\">#gnudist</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "All the &ldquo;Linux&rdquo; distributions are actually versions of the GNU "
 "system with Linux as the kernel.  The purpose of the term &ldquo;GNU/"
@@ -2305,7 +2348,7 @@
 "GNU/Linux&rdquo; тільки його, це приховало б ту 
ідею, яку ми хочемо "
 "висловити."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "As for developing a distribution of GNU/Linux, we already did this once, "
 "when we funded the early development of Debian GNU/Linux.  To do it again "
@@ -2319,7 +2362,7 @@
 "якщо у нового дистрибутива не було б 
істотних практичних переваг перед "
 "іншими дистрибутивами, це було б 
позбавлене сенсу."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Instead we help the developers of 100% free GNU/Linux distributions, such as "
 "gNewSense and Ututo."
@@ -2327,7 +2370,7 @@
 "Замість цього ми допомагаємо розробникам 
вільних на 100% дистрибутивів GNU/"
 "Linux, таких, як gNewSense і Ututo."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not just say &ldquo;Linux is the GNU kernel&rdquo; and release some "
 "existing version of GNU/Linux under the name &ldquo;GNU&rdquo;? <span class="
@@ -2338,7 +2381,7 @@
 "<span class=\"anchor-reference-id\"><a href=\"#linuxgnu\">#linuxgnu</a></"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It might have been a good idea to adopt Linux as the GNU kernel back in "
 "1992.  If we had realized, then, how long it would take to get the GNU Hurd "
@@ -2349,7 +2392,7 @@
 "щоб привести GNU Hurd в робочий стан, ми б так 
і зробили. (Але минулого, на "
 "жаль, не повернеш)."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we were to take an existing version of GNU/Linux and relabel it as &ldquo;"
 "GNU&rdquo;, that would be somewhat like making a version of the GNU system "
@@ -2361,7 +2404,7 @@
 "перейменувати її в &ldquo;Linux&rdquo;. Це було 
несправедливо, і ми не "
 "хочемо діяти подібним чином."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Did the GNU Project condemn and oppose use of Linux in the early days? <span "
 "class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
@@ -2370,7 +2413,7 @@
 "початку? <span class=\"anchor-reference-id\"><a 
href=\"#condemn\">#condemn</"
 "a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We did not adopt Linux as our kernel, but we didn't condemn or oppose it.  "
 "In 1993 we started discussing the arrangements to sponsor the development of "
@@ -2388,7 +2431,7 @@
 "&ldquo;з коробки&rdquo;. Але ці зміни часто були 
недалекоглядними і "
 "нестерпні; вони вимагали корекції перед 
прийняттям."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who had made the changes showed little interest in cooperating "
 "with us.  One of them actually told us that he didn't care about working "
@@ -2406,7 +2449,7 @@
 "засновану головним чином на GNU, були 
першою (і до цих пір практично єдиною) "
 "групою, що не бажає працювати з нами."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It was this experience that first showed us that people were calling a "
 "version of the GNU system &ldquo;Linux&rdquo;, and that this confusion was "
@@ -2420,7 +2463,7 @@
 "наша реакція на цю проблему і на інші 
проблеми, викликані неправильним "
 "назвою &ldquo;Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why did you wait so long before asking people to use the name GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
@@ -2429,7 +2472,7 @@
 "Linux&rdquo;? <span class=\"anchor-reference-id\"><a href=\"#wait\">#wait</"
 "a></span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually we didn't.  We began talking privately with developers and "
 "distributors about this in 1994, and made a more public campaign in 1996.  "
@@ -2440,7 +2483,7 @@
 "1996&nbsp;році провели більшу відкриту 
кампанію. Ми будемо продовжувати "
 "стільки, скільки буде потрібно."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should the GNU/<i>name</i> convention be applied to all programs that are "
 "GPL'ed? <span class=\"anchor-reference-id\">(<a href=\"#allgpled"
@@ -2450,7 +2493,7 @@
 "всіх програм під ліцензією GPL? <span 
class=\"anchor-reference-id\"><a href="
 "\"#allgpled\">#allgpled</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We never refer to individual programs as &ldquo;GNU/<i>name</i>&rdquo;.  "
 "When a program is a GNU package, we may call it &ldquo;GNU <i>name</"
@@ -2460,7 +2503,7 @@
 "програма є одним з пакунків GNU, то ми 
можемо називати її &ldquo;GNU [назва]"
 "&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU, the operating system, is made up of many different programs.  Some of "
 "the programs in GNU were written as part of the GNU Project or specifically "
@@ -2471,7 +2514,7 @@
 "програм GNU були написані як частина 
проекту GNU або спеціально передані "
 "йому; це пакунки GNU, і ми часто вживаємо 
&ldquo;GNU&rdquo; в їхній назві."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It's up to the developers of a program to decide if they want to contribute "
 "it and make it a GNU package.  If you have developed a program and you would "
@@ -2485,7 +2528,7 @@
 "\">&lt;gnu@gnu.org&gt;</a>, щоб ми могли скласти про 
неї думку і вирішити, "
 "чи потрібна вона нам."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It wouldn't be fair to put the name GNU on every individual program that is "
 "released under the GPL.  If you write a program and release it under the "
@@ -2505,7 +2548,7 @@
 "пакетом GNU, то проект GNU не може ставити це 
собі в заслугу, і додавати "
 "&ldquo;GNU&rdquo; до його назви було б недоречно."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In contrast, we do deserve the overall credit for the GNU operating system "
 "as a whole, even though not for each and every program in it.  The system "
@@ -2517,7 +2560,7 @@
 "нашій рішучості і наполегливості 
починаючи з 1984&nbsp;року&nbsp;&nbsp; що "
 "на багато років раніше, ніж були розпочаті 
роботи над Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The operating system in which Linux became popular was basically the same as "
 "the GNU operating system.  It was not entirely the same, because it had a "
@@ -2529,7 +2572,7 @@
 "що у неї було інше ядро, але це була 
здебільшого та сама система. Це був "
 "один з варіантів GNU. Це була система GNU/Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux continues to be used primarily in derivatives of that system&mdash;in "
 "today's versions of the GNU/Linux system.  What gives these systems their "
@@ -2541,7 +2584,7 @@
 "систем є те, що в центрі розташовані GNU і 
Linux, а не тільки ядро (Linux) "
 "саме по собі."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since much of GNU comes from Unix, shouldn't GNU give credit to Unix by "
 "using &ldquo;Unix&rdquo; in its name? <span class=\"anchor-reference-id\">"
@@ -2551,7 +2594,7 @@
 "вживаючи &ldquo;Unix&rdquo; у своїй назві? <span 
class=\"anchor-reference-id"
 "\"><a href=\"#unix\">#unix</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Actually, none of GNU comes from Unix.  Unix was proprietary software (and "
 "still is), so using any of its code in GNU would have been illegal.  This is "
@@ -2567,7 +2610,7 @@
 "потрібна була вільна система, щоб 
замінити її. Ми не могли копіювати "
 "програми або навіть їхні частини з Unix; все 
доводилося писати заново."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "No code in GNU comes from Unix, but GNU is a Unix-compatible system; "
 "therefore, many of the ideas and specifications of GNU do come from Unix.  "
@@ -2583,13 +2626,22 @@
 "традицією використовувати рекурсивні 
скорочення, що з'явилася в сімдесяті "
 "роки."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The first such recursive acronym was TINT, &ldquo;TINT Is Not "
+#| "TECO&rdquo;.  The author of TINT wrote another implementation of TECO "
+#| "(there were already many of them, for various systems), but instead of "
+#| "calling it by a dull name like &ldquo;<em>somethingorother</em> "
+#| "TECO&rdquo;, he thought of a clever amusing name.  (That's what hacking "
+#| "means: <a href=\"http://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
 "The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
 "The author of TINT wrote another implementation of TECO (there were already "
 "many of them, for various systems), but instead of calling it by a dull name "
 "like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of a clever "
-"amusing name.  (That's what hacking means: <a href=\"http://stallman.org/";
+"amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
 "Першим таким рекурсивным скороченням 
було TINT, &ldquo;TINT Is Not "
@@ -2600,7 +2652,7 @@
 "як&rdquo;: <a 
href=\"http://stallman.org/articles/on-hacking.html\";>грайлива "
 "дотепність</a>.)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Other hackers enjoyed that name so much that we imitated the approach.  It "
 "became a tradition that, when you were writing from scratch a program that "
@@ -2617,7 +2669,7 @@
 "Klever&rdquo;). У цьому ж дусі ми назвали нашу 
заміну Unix &ldquo;GNU&nbsp;"
 "&mdash; це не Unix&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Historically, AT&amp;T which developed Unix did not want anyone to give it "
 "credit by using &ldquo;Unix&rdquo; in the name of a similar system, not even "
@@ -2633,7 +2685,7 @@
 "Тому всі модифіковані версії Unix (повністю 
невільні, як Unix) мали зовсім "
 "іншу назву, яка не містила &ldquo;Unix&rdquo;."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we say &ldquo;GNU/BSD&rdquo; too? <span class=\"anchor-reference-id\">"
 "(<a href=\"#bsd\">#bsd</a>)</span>"
@@ -2641,7 +2693,7 @@
 "Чи слід нам також говорити &ldquo;GNU/BSD&rdquo;? <span 
class=\"anchor-"
 "reference-id\"><a href=\"#bsd\">#bsd</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems, "
 "because that term does not fit the history of the BSD systems."
@@ -2649,9 +2701,15 @@
 "Ми не називаємо системи BSD (FreeBSD і т.&nbsp;п.) 
системами &ldquo;GNU/"
 "BSD&rdquo;, тому що цей термін не відповідає 
історії систем BSD."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The BSD system was developed by UC Berkeley as non-free software in the "
+#| "80s, and became free in the early 90s.  A free operating system that "
+#| "exists today is almost certainly either a variant of the GNU system, or a "
+#| "kind of BSD system."
 msgid ""
-"The BSD system was developed by UC Berkeley as non-free software in the 80s, "
+"The BSD system was developed by UC Berkeley as nonfree software in the 80s, "
 "and became free in the early 90s.  A free operating system that exists today "
 "is almost certainly either a variant of the GNU system, or a kind of BSD "
 "system."
@@ -2661,7 +2719,7 @@
 "дев'яностих. Будь-яка вільна операційна 
система, існуюча сьогодні, майже "
 "напевно є або варіантом системи GNU, або 
різновидом системи BSD."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "People sometimes ask whether BSD too is a variant of GNU, as GNU/Linux is.  "
 "It is not.  The BSD developers were inspired to make their code free "
@@ -2675,7 +2733,7 @@
 "приступити до цього, але їхні тексти 
програм мали мало спільного з текстами "
 "частин GNU."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "BSD systems today use some GNU packages, just as the GNU system and its "
 "variants use some BSD programs; however, taken as wholes, they are two "
@@ -2689,7 +2747,7 @@
 "в систему GNU, розробивши його, тому назва 
типу &ldquo;GNU/BSD&rdquo; не "
 "підійшла б до ситуації."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The connection between GNU/Linux and GNU is much closer, and that's why the "
 "name &ldquo;GNU/Linux&rdquo; is appropriate for it."
@@ -2697,7 +2755,7 @@
 "Зв'язок між GNU/Linux і GNU набагато тісніший, 
тому назва &ldquo;GNU/"
 "Linux&rdquo; для неї підходить."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is a version of GNU which uses the kernel from NetBSD.  Its developers "
 "call it &ldquo;Debian GNU/NetBSD&rdquo;, but &ldquo;GNU/"
@@ -2710,7 +2768,7 @@
 "б точніше, оскільки NetBSD&nbsp;&mdash; це ціла 
система, а не тільки ядро. "
 "Це не система BSD, оскільки здебільшого це 
та ж система, що і GNU/Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "If I install the GNU tools on Windows, does that mean I am running a GNU/"
 "Windows system? <span class=\"anchor-reference-id\">(<a href=\"#othersys"
@@ -2720,7 +2778,7 @@
 "використовую систему GNU/Windows? <span 
class=\"anchor-reference-id\"><a "
 "href=\"#othersys\">#othersys</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
 "GNU are just a part of the GNU software, which is just a part of the GNU "
@@ -2734,7 +2792,7 @@
 "у якої немає спільних з GNU вихідних 
текстів. Загалом, це абсолютно відмінна "
 "від GNU/Linux ситуація."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can't Linux be used without GNU? <span class=\"anchor-reference-id\">(<a "
 "href=\"#justlinux\">#justlinux</a>)</span>"
@@ -2742,7 +2800,7 @@
 "Хіба Linux не можна використовувати без GNU? 
<span class=\"anchor-reference-"
 "id\"><a href=\"#justlinux\">#justlinux</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is used by itself, or with small other programs, in some appliances.  "
 "These small software systems are a far cry from the GNU/Linux system.  Users "
@@ -2757,7 +2815,7 @@
 "показати, наскільки ці невеликі платформи 
відрізняються від GNU/Linux, "
 "корисно говорити, що в цих додатках працює 
тільки Linux."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How much of the GNU system is needed for the system to be GNU/Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
@@ -2765,7 +2823,7 @@
 "Яку частку системи GNU повинна містити 
система, щоб бути GNU/Linux? <span "
 "class=\"anchor-reference-id\"><a href=\"#howmuch\">#howmuch</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "&ldquo;How much&rdquo; is not a meaningful question because the GNU system "
 "does not have precise boundaries."
@@ -2773,7 +2831,7 @@
 "Питання &ldquo;яка частка?&rdquo; не має сенсу, 
тому що у системи GNU немає "
 "точних меж."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is an operating system maintained by a community.  It includes far more "
 "than just the GNU software packages (of which we have a specific list), and "
@@ -2789,7 +2847,7 @@
 "користуєтеся частиною системи GNU, а 
частину опускаєте, не можна осмислено "
 "сказати, &ldquo;якою часткою&rdquo; ви 
користуєтеся."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we look at the level of packages, Linux is one important package in the "
 "GNU/Linux system.  The inclusion of one important GNU package is enough to "
@@ -2799,7 +2857,7 @@
 "системи GNU/Linux. Включення одного важливого 
пакету GNU достатньо, щоб "
 "виправдати наше прохання про згадку на 
рівних правах."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Are there complete Linux systems [sic] without GNU? <span class=\"anchor-"
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
@@ -2808,7 +2866,7 @@
 "Чи існують повні системи Linux (так!) без GNU? 
<span class=\"anchor-"
 "reference-id\"><a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There are complete systems that contain Linux and not GNU; Android is an "
 "example.  But it is a mistake to call them &ldquo;Linux&rdquo; systems, just "
@@ -2819,7 +2877,7 @@
 "неправильно, точно так само, як 
неправильно називати системою GNU &ldquo;"
 "Linux&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android is very different from the GNU/Linux system&mdash;because the two "
 "have very little code in common.  In fact, the only thing they have in "
@@ -2828,7 +2886,7 @@
 "Android сильно відрізняється від системи 
GNU/Linux&nbsp;&nbsp; тому що у них "
 "дуже мало спільного. Насправді спільне в 
них тільки одне: Linux."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
 "necessary to say things like, &ldquo;Android contains Linux, but it isn't "
@@ -2840,7 +2898,7 @@
 "Linux, тому що в ньому немає звичайних в Linux 
(так!) бібліотек і утиліт "
 "(маючи на увазі під цим систему GNU)&rdquo;."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android contains just as much of Linux as GNU/Linux does.  What it doesn't "
 "have is the GNU system.  Android replaces that with Google software that "
@@ -2852,7 +2910,7 @@
 "які працюють зовсім по-іншому. Android від 
системи GNU/Linux відрізняє саме "
 "відсутність GNU."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Is it correct to say &ldquo;using Linux&rdquo; if it refers to using GNU/"
 "Linux and using Android? <span class=\"anchor-reference-id\">(<a href="
@@ -2860,27 +2918,27 @@
 "\">#usegnulinuxandandroidlinuxsyswithoutgnu</a>)</span>"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Far from it.  That usage is so strained that people will not understand the "
 "intended meaning."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public will find it very strange to speak of using Android as &ldquo;"
 "using Linux&rdquo;.  It's like having a conversation, then saying you were "
 "conversing with the person's intestines or the person's circulatory system."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public <em>will</em> understand the idea of &ldquo;using Linux&rdquo; "
 "when it's really GNU/Linux, by way of the usual misunderstanding: thinking "
 "of the whole system as &ldquo;Linux&rdquo;."
 msgstr ""
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Use of Android and use of GNU/Linux are totally different, as different as "
 "driving a car and riding a bicycle.  The fact that the first two both "
@@ -2893,7 +2951,7 @@
 "GNU/Linux and Android.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not call the system &ldquo;Linux&rdquo; anyway, and strengthen Linus "
 "Torvalds' role as posterboy for our community? <span class=\"anchor-"
@@ -2904,7 +2962,7 @@
 "спільноти? <span class=\"anchor-reference-id\"><a href=\"#helplinus"
 "\">#helplinus</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Linus Torvalds is the &ldquo;posterboy&rdquo; (other people's choice of "
 "word, not ours) for his goals, not ours.  His goal is to make the system "
@@ -2922,12 +2980,22 @@
 "philosophy/why-free.html\">свободу співпраці</a> як 
етичний принцип, тому "
 "громадськість і не пов'язує назви 
&ldquo;Linux&rdquo; з цим принципом."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Linus publicly states his disagreement with the free software movement's "
+#| "ideals.  He developed non-free software in his job for many years (and "
+#| "said so to a large audience at a &ldquo;Linux&rdquo;World show), and "
+#| "publicly invited fellow developers of Linux, the kernel, to use non-free "
+#| "software to work on it with him.  He goes even further, and rebukes "
+#| "people who suggest that engineers and scientists should consider social "
+#| "consequences of our technical work&mdash;rejecting the lessons society "
+#| "learned from the development of the atom bomb."
 msgid ""
 "Linus publicly states his disagreement with the free software movement's "
-"ideals.  He developed non-free software in his job for many years (and said "
+"ideals.  He developed nonfree software in his job for many years (and said "
 "so to a large audience at a &ldquo;Linux&rdquo;World show), and publicly "
-"invited fellow developers of Linux, the kernel, to use non-free software to "
+"invited fellow developers of Linux, the kernel, to use nonfree software to "
 "work on it with him.  He goes even further, and rebukes people who suggest "
 "that engineers and scientists should consider social consequences of our "
 "technical work&mdash;rejecting the lessons society learned from the "
@@ -2942,7 +3010,7 @@
 "своєї технічної роботи&nbsp;&mdash; незважаючи 
на урок, який дала "
 "суспільству розробка атомної бомби."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with writing a free program for the motivations of "
 "learning and having fun; the kernel Linus wrote for those reasons was an "
@@ -2961,7 +3029,7 @@
 "однак люди повинні знати, що коріння 
операційної системи, про яку йде мова, "
 "лежать в ідеалах свободи, а не в його 
світогляді."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong for us to label Linus Torvalds' work as GNU? <span class="
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
@@ -2969,7 +3037,7 @@
 "Хіба чесно з нашого боку приписувати GNU 
роботу Лінуса Торвальдса? <span "
 "class=\"anchor-reference-id\"><a href=\"#claimlinux\">#claimlinux</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong, so we don't do that.  Torvalds' work is Linux, the "
 "kernel; we are careful not to attribute that work to the GNU Project or "
@@ -2981,7 +3049,7 @@
 "і не позначати її як &ldquo;GNU&rdquo;. Коли ми 
говоримо про систему в "
 "цілому, назва &ldquo;GNU/Linux&rdquo; відзначає його 
заслуги."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Does Linus Torvalds agree that Linux is just the kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
@@ -2990,10 +3058,17 @@
 "class=\"anchor-reference-id\"><a href=\"#linusagreed\">#linusagreed</a></"
 "span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
+#| "versions/RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are "
+#| "GNU software and are under the GNU copyleft. These tools aren't in the "
+#| "distribution - ask me (or GNU)  for more info&rdquo;</a>."
 msgid ""
 "He recognized this at the beginning.  The earliest Linux release notes said, "
-"<a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"<a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
 "RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are GNU software "
 "and are under the GNU copyleft. These tools aren't in the distribution - ask "
 "me (or GNU)  for more info&rdquo;</a>."
@@ -3004,7 +3079,7 @@
 "дистрибутив&nbsp;&nbsp; звертайтесь до мене 
(або в GNU) за додатковою "
 "інформацією&rdquo;<a href=\"#ft1\">[1]</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not finish the GNU Hurd kernel, release the GNU system as a whole, and "
 "forget the question of what to call GNU/Linux? <span class=\"anchor-"
@@ -3014,7 +3089,7 @@
 "питання про те, що називати GNU/Linux? <span 
class=\"anchor-reference-id"
 "\"><a href=\"#finishhurd\">#finishhurd</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We would like credit for the GNU operating system no matter which kernel is "
 "used with it."
@@ -3022,13 +3097,20 @@
 "Ми хотіли б, щоби операційна система GNU 
отримувала визнання незалежно від "
 "того, з яким ядром вона застосовується."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Making the GNU Hurd work well enough to compete with Linux would be a big "
+#| "job, and it's not clearly necessary.  The only thing ethically wrong with "
+#| "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the "
+#| "best fix for that problem is <a href=\"http://fsf.org/campaigns/priority-";
+#| "projects\"> developing free replacement for the blobs</a>."
 msgid ""
 "Making the GNU Hurd work well enough to compete with Linux would be a big "
 "job, and it's not clearly necessary.  The only thing ethically wrong with "
 "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the best "
-"fix for that problem is <a href=\"http://fsf.org/campaigns/priority-projects";
-"\"> developing free replacement for the blobs</a>."
+"fix for that problem is <a href=\"https://www.fsf.org/campaigns/priority-";
+"projects\"> developing free replacement for the blobs</a>."
 msgstr ""
 "Доопрацювати GNU Hurd до стадії, коли ядро 
могло б позмагатися з Linux, було "
 "б великою роботою, необхідність якої не 
очевидна. Єдине, що етично невірно в "
@@ -3036,7 +3118,7 @@
 "для пристроїв; краще всього цю проблему 
вирішує <a href=\"http://fsf.org/";
 "campaigns/priority-projects\"> розробка вільних 
аналогів ляпок</a>."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The battle is already lost&mdash;society has made its decision and we can't "
 "change it, so why even think about it? <span class=\"anchor-reference-id\">"
@@ -3046,7 +3128,7 @@
 "його змінити; може не варто навіть думати 
про це? <span class=\"anchor-"
 "reference-id\"><a href=\"#lost\">#lost</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This isn't a battle, it is a campaign of education.  What to call the system "
 "is not a single decision, to be made at one moment by &ldquo;society&rdquo;: "
@@ -3062,7 +3144,7 @@
 "можете вирішити називати систему 
&ldquo;GNU/Linux&rdquo; самі&nbsp;&mdash; і "
 "таким чином, ви допоможете навчити інших."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Society has made its decision and we can't change it, so what good does it "
 "do if I say &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id\">(<a "
@@ -3072,7 +3154,7 @@
 "користь від того, що я буду говорити 
&ldquo;GNU/Linux&rdquo;? <span class="
 "\"anchor-reference-id\"><a href=\"#whatgood\">#whatgood</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is not an all-or-nothing situation: correct and incorrect pictures are "
 "being spread more or less by various people.  If you call the system &ldquo;"
@@ -3093,7 +3175,7 @@
 "Linux&rdquo;, ви навчите значне число людей без 
особливої праці. А деякі з "
 "них передадуть виправлення далі."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to call the system &ldquo;Linux&rdquo; and teach "
 "people its real origin with a ten-minute explanation? <span class=\"anchor-"
@@ -3103,7 +3185,7 @@
 "витоками десятихвилинною розповіддю? <span 
class=\"anchor-reference-id\"><a "
 "href=\"#explain\">#explain</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "If you help us by explaining to others in that way, we appreciate your "
 "effort, but that is not the best method.  It is not as effective as calling "
@@ -3114,7 +3196,7 @@
 "як якщо називати систему &ldquo;GNU/Linux&rdquo;, а 
також неефективно "
 "витрачає ваш час."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is ineffective because it may not sink in, and surely will not "
 "propagate.  Some of the people who hear your explanation will pay attention, "
@@ -3131,7 +3213,7 @@
 "будуть називати її &ldquo;Linux&rdquo;. Без 
особливого наміру вони будуть "
 "допомагати зростанню омани."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is inefficient because it takes a lot more time.  Saying and writing "
 "&ldquo;GNU/Linux&rdquo; will take you only a few seconds a day, not minutes, "
@@ -3146,7 +3228,7 @@
 "коли ви говорите або пишете, набагато 
легше, ніж допомагати проекту GNU будь-"
 "яким іншим з ефективних способів."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people laugh at you when you ask them to call the system GNU/Linux.  "
 "Why do you subject yourself to this treatment? <span class=\"anchor-"
@@ -3156,7 +3238,7 @@
 "Навіщо ви піддаєте себе таким зверненням? 
<span class=\"anchor-reference-id"
 "\"><a href=\"#treatment\">#treatment</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; tends to give people a mistaken "
 "picture of the system's history and reason for existence.  People who laugh "
@@ -3171,7 +3253,7 @@
 "вони сміються, коли ми просимо визнання за 
неї. Якщо б вони знали правду, "
 "вони, ймовірно, не сміялися."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Why do we take the risk of making a request that sometimes leads people to "
 "ridicule us? Because often it has useful results that help the GNU Project.  "
@@ -3182,7 +3264,7 @@
 "результатів, які допомагають проекту GNU. 
Ми згодні йти на ризик "
 "незаслужених образ заради досягнення 
наших цілей."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you see such an ironically unfair situation occurring, please don't sit "
 "idly by.  Please teach the laughing people the real history.  When they see "
@@ -3193,7 +3275,7 @@
 "історію. Коли вони зрозуміють, чому це прох
ання справедливе, ті, у кого є "
 "хоч частка здорового глузду, перестануть 
сміятися."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people condemn you when you ask them to call the system GNU/Linux.  "
 "Don't you lose by alienating them? <span class=\"anchor-reference-id\">(<a "
@@ -3203,7 +3285,7 @@
 "Linux&rdquo;. Хіба ви не програєте, відчужуючи їх
? <span class=\"anchor-"
 "reference-id\"><a href=\"#alienate\">#alienate</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not much.  People who don't appreciate our role in developing the system are "
 "unlikely to make substantial efforts to help us.  If they do work that "
@@ -3220,7 +3302,7 @@
 "комусь іншому, вони підривають наші 
можливості щодо залучення інших людей "
 "для допомоги нам."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It makes no sense to worry about alienating people who are already mostly "
 "uncooperative, and it is self-defeating to be deterred from correcting a "
@@ -3233,7 +3315,7 @@
 "себе гнів людей, які не хочуть її усунення. 
Тому ми будемо продовжувати "
 "намагатися виправити неправильну назву."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Whatever you contributed, is it legitimate to rename the operating system? "
 "<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
@@ -3241,7 +3323,7 @@
 "Яких би зусиль ви не доклали, хіба можна 
перейменовувати операційну систему? "
 "<span class=\"anchor-reference-id\"><a href=\"#rename\">#rename</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are not renaming anything; we have been calling this system &ldquo;"
 "GNU&rdquo; ever since we announced it in 1983.  The people who tried to "
@@ -3251,7 +3333,7 @@
 "пір, як ми оголосили про неї у 1983&nbsp;році. 
Люди, які спробували "
 "перейменувати її в &ldquo;Linux&rdquo;, не повинні 
були це робити."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong to force people to call the system &ldquo;GNU/Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
@@ -3259,7 +3341,7 @@
 "Хіба чесно змушувати людей називати 
систему &ldquo;GNU/Linux&rdquo;? <span "
 "class=\"anchor-reference-id\"><a href=\"#force\">#force</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong to force them, and we don't try.  We call the system "
 "&ldquo;GNU/Linux&rdquo;, and we ask you to do it too."
@@ -3267,7 +3349,7 @@
 "Було б нечесно змушувати їх, і ми не 
намагаємося робити це. Ми називаємо "
 "систему &ldquo;GNU/Linux&rdquo; і просимо вас чинити 
так само."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not sue people who call the whole system &ldquo;Linux&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
@@ -3276,7 +3358,7 @@
 "&ldquo;Linux&rdquo;? <span class=\"anchor-reference-id\"><a href=\"#whynotsue"
 "\">#whynotsue</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are no legal grounds to sue them, but since we believe in freedom of "
 "speech, we wouldn't want to do that anyway.  We ask people to call the "
@@ -3287,7 +3369,7 @@
 "цього. Ми просимо людей називати систему 
&ldquo;GNU/Linux&rdquo;, тому що це "
 "правильно."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Shouldn't you put something in the GNU GPL to require people to call the "
 "system &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id\">(<a href="
@@ -3296,13 +3378,23 @@
 "Чи не слід вам внести в GNU GPL вимогу 
називати систему &ldquo;GNU&rdquo;? "
 "<span class=\"anchor-reference-id\"><a href=\"#require\">#require</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU GPL is to protect the users' freedom from those "
+#| "who would make proprietary versions of free software.  While it is true "
+#| "that those who call the system &ldquo;Linux&rdquo; often do things that "
+#| "limit the users' freedom, such as bundling non-free software with the GNU/"
+#| "Linux system or even developing non-free software for such use, the mere "
+#| "act of calling the system &ldquo;Linux&rdquo; does not, in itself, deny "
+#| "users their freedom.  It seems improper to make the GPL restrict what "
+#| "name people can use for the system."
 msgid ""
 "The purpose of the GNU GPL is to protect the users' freedom from those who "
 "would make proprietary versions of free software.  While it is true that "
 "those who call the system &ldquo;Linux&rdquo; often do things that limit the "
-"users' freedom, such as bundling non-free software with the GNU/Linux system "
-"or even developing non-free software for such use, the mere act of calling "
+"users' freedom, such as bundling nonfree software with the GNU/Linux system "
+"or even developing nonfree software for such use, the mere act of calling "
 "the system &ldquo;Linux&rdquo; does not, in itself, deny users their "
 "freedom.  It seems improper to make the GPL restrict what name people can "
 "use for the system."
@@ -3316,7 +3408,7 @@
 "користувачів. Нам здається недоречним 
змінювати GPL так, щоб вона обмежувала "
 "користувачів у виборі назви для системи."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you objected to the original BSD license's advertising requirement to "
 "give credit to the University of California, isn't it hypocritical to demand "
@@ -3328,7 +3420,7 @@
 "Каліфорнійського університету? <span 
class=\"anchor-reference-id\"><a href="
 "\"#BSDlicense\">#BSDlicense</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would be hypocritical to make the name GNU/Linux a license requirement, "
 "and we don't.  We only <em>ask</em> you to give us the credit we deserve."
@@ -3336,7 +3428,7 @@
 "Було б лицемірством зробити назву GNU/Linux 
вимогою ліцензії, і ми цього не "
 "робимо. Ми тільки <em>просимо</em> про 
визнання, якого ми заслуговуємо."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please note that there are at least <a href=\"/licenses/bsd.html\"> two "
 "different BSD licenses</a>.  For clarity's sake, please don't use the term "
@@ -3346,7 +3438,7 @@
 "різні ліцензії BSD</a>. Для зрозумілості не 
користуйтеся, будь ласка, "
 "виразом &ldquo;ліцензія BSD&rdquo;, не згадуючи 
про те, яка саме це ліцензія."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you failed to put something in the GNU GPL to require people to call "
 "the system &ldquo;GNU&rdquo;, you deserve what happened; why are you "
@@ -3357,7 +3449,7 @@
 "ви заслуговуєте на те, що сталося; чому ж 
ви тепер скаржитеся? <span class="
 "\"anchor-reference-id\"><a href=\"#deserve\">#deserve</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The question presupposes a rather controversial general ethical premise: "
 "that if people do not force you to treat them fairly, you are entitled to "
@@ -3369,11 +3461,11 @@
 "так, як вам завгодно. Іншими словами, це 
передбачає, що чия сила, того й  "
 "правда."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope you disagree with that premise just as we do."
 msgstr "Ми сподіваємося, що ви не згодні з цим 
положенням так само, як і ми."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't you be better off not contradicting what so many people believe? "
 "<span class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)"
@@ -3383,7 +3475,7 @@
 "багато людей? <span class=\"anchor-reference-id\"><a 
href=\"#contradict"
 "\">#contradict</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't think we should go along with large numbers of people because they "
 "have been misled.  We hope you too will decide that truth is important."
@@ -3391,7 +3483,7 @@
 "Ми не думаємо, що ми повинні слідувати за 
великою кількістю людей, тому що "
 "їх ввели в оману. Сподіваємося, ви теж 
вирішите, що істина важлива."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We could never have developed a free operating system without first denying "
 "the belief, held by most people, that proprietary software was legitimate "
@@ -3401,7 +3493,7 @@
 "відмовилися від переконання, прийнятого 
більшістю людей, що невільне "
 "програмне забезпечення законне і 
прийнятне."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
 "<span class=\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</"
@@ -3411,11 +3503,11 @@
 "<span class=\"anchor-reference-id\"><a href=\"#somanyright\">#somanyright</"
 "a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "We don't think that the popularity of an error makes it the truth."
 msgstr "Ми не думаємо, що популярність омани 
перетворює її в істину."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it better to call the system by the name most users already know? "
 "<span class=\"anchor-reference-id\">(<a href=\"#knownname\">#knownname</a>)</"
@@ -3425,7 +3517,7 @@
 "<span class=\"anchor-reference-id\"><a href=\"#knownname\">#knowname</a></"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo; includes "
 "&ldquo;Linux&rdquo;, they will recognize what you're talking about.  If you "
@@ -3437,7 +3529,7 @@
 "говорите. Якщо ви час від часу будете 
додавати &ldquo;(часто помилково звана "
 "&ldquo;Linux&rdquo;)&rdquo;, то всі вони це зрозуміють."
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many people care about what's convenient or who's winning, not about "
 "arguments of right or wrong.  Couldn't you get more of their support by a "
@@ -3449,12 +3541,19 @@
 "сторони при іншому підході? <span 
class=\"anchor-reference-id\"><a href="
 "\"#winning\">#winning</a></span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+#, fuzzy
+#| msgid ""
+#| "To care only about what's convenient or who's winning is an amoral "
+#| "approach to life.  Non-free software is an example of that amoral "
+#| "approach and thrives on it.  Thus, in the long run it would be self-"
+#| "defeating for us to adopt that approach.  We will continue talking in "
+#| "terms of right and wrong."
 msgid ""
 "To care only about what's convenient or who's winning is an amoral approach "
-"to life.  Non-free software is an example of that amoral approach and "
-"thrives on it.  Thus, in the long run it would be self-defeating for us to "
-"adopt that approach.  We will continue talking in terms of right and wrong."
+"to life.  Nonfree software is an example of that amoral approach and thrives "
+"on it.  Thus, in the long run it would be self-defeating for us to adopt "
+"that approach.  We will continue talking in terms of right and wrong."
 msgstr ""
 "Дбати лише про те, що зручніше і хто 
виграє&nbsp;&mdash; це аморальний "
 "підхід до життя. Невільні програми 
являють приклад такого аморального "
@@ -3462,7 +3561,7 @@
 "прийняти такий підхід означало б приректи 
себе на провал. Ми будемо "
 "продовжувати говорити в термінах добра і 
зла."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope that you are one of those for whom right and wrong do matter."
 msgstr ""
 "Сподіваємося, що ви належите до тих, для 
кого добро і зло мають значення."
@@ -3516,8 +3615,8 @@
 #| "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, "
 #| "2016, 2017, 2018 Free Software Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation, "
+"Inc."
 msgstr ""
 "Copyright &copy; 2001, 2006, 2007, 2008, 2010, 2011, 2013, 2014, 2015, 2016, "
 "2017, 2018 Free Software Foundation, Inc. (Фонд вільного 
програмного "

Index: gnu/po/gnu-linux-faq.zh-cn.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-linux-faq.zh-cn.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- gnu/po/gnu-linux-faq.zh-cn.po       12 Apr 2021 07:33:48 -0000      1.17
+++ gnu/po/gnu-linux-faq.zh-cn.po       30 Aug 2021 13:34:53 -0000      1.18
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-linux-faq.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-04-12 14:59+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -14,33 +14,21 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 
 #. type: Content of: <title>
 msgid "GNU/Linux FAQ - GNU Project - Free Software Foundation"
 msgstr "GNU/Linux 问答 - GNU 工程 - 自由软件基金会"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU/Linux FAQ"
 msgstr "GNU/Linux 问答"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by Richard Stallman"
 msgstr "Richard Stallman 著"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
-"linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a href=\"/"
-"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"要了解更多,你还可以阅读我们关于<a 
href=\"/gnu/linux-and-gnu.html\">Linux和"
-"GNU工程</a>的网页、关于<a 
href=\"/gnu/why-gnu-linux.html\">为什么是GNU/"
-"Linux?</a>的网页和关于<a 
href=\"/gnu/gnu-users-never-heard-of-gnu.html\">从"
-"未听说过GNU的GNU用户</a>的网页。"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When people see that we use and recommend the name GNU/Linux for a system "
 "that many others call just &ldquo;Linux&rdquo;, they ask many questions.  "
@@ -49,6 +37,12 @@
 "当人们看到我们使用并建议GNU/Linux作为系统名称,而å…
¶ä»–人称之为&ldquo;"
 
"Linux&rdquo;时,他们会问许多问题。此处列举了常见问题以及我们的回答。"
 
+#. type: Content of: <div><div><h3>
+#, fuzzy
+#| msgid "Table of Contents"
+msgid "Table of Contents"
+msgstr "目录"
+
 #. type: Content of: <div><div><ul><li>
 msgid ""
 "<a href=\"#why\">Why do you call the system we use GNU/Linux and not Linux?</"
@@ -598,7 +592,27 @@
 "<a 
href=\"#winning\">许多人在乎的是哪里方便或谁个获胜,而不是谁是谁非。通过不"
 "同的方式不是能获得更多的支持吗?</a>"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our page on <a href=\"/"
+#| "gnu/linux-and-gnu.html\">Linux and the GNU Project</a>, our page on <a "
+#| "href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can also read our page on <a href=\"/gnu/"
+"linux-and-gnu.html\">Linux and the GNU System</a>, our page on <a href=\"/"
+"gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"要了解更多,你还可以阅读我们关于<a 
href=\"/gnu/linux-and-gnu.html\">Linux和"
+"GNU工程</a>的网页、关于<a 
href=\"/gnu/why-gnu-linux.html\">为什么是GNU/"
+"Linux?</a>的网页和关于<a 
href=\"/gnu/gnu-users-never-heard-of-gnu.html\">从"
+"未听说过GNU的GNU用户</a>的网页。"
+
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you call the system we use GNU/Linux and not Linux? <span class="
 "\"anchor-reference-id\">(<a href=\"#why\">#why</a>)</span>"
@@ -606,7 +620,7 @@
 "为什么你称该系统为GNU/Linux而不是Linux?<span 
class=\"anchor-reference-id\">"
 "(<a href=\"#why\">#why</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Most operating system distributions based on Linux as kernel are basically "
 "modified versions of the GNU operating system.  We began developing GNU in "
@@ -622,11 +636,11 @@
 "方向。我们开发了大多数æ 
¸å¿ƒéƒ¨ä»¶ï¼Œå®ƒä»¬æž„成了整个系统单一的最大贡献部分。基础版"
 "本也来自我们的贡献。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "In fairness, we ought to get at least equal mention."
 msgstr "为了公平,我们至少应该被平等对待。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "See <a href=\"/gnu/linux-and-gnu.html\">Linux and the GNU System</a> and <a "
 "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
@@ -637,7 +651,7 @@
 
"gnu-users-never-heard-of-gnu.html\">从未听说过GNU的GNU用户</a>来了解更多说"
 "明,并参看<a 
href=\"/gnu/the-gnu-project.html\">GNU工程</a>来了解历史。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why is the name important? <span class=\"anchor-reference-id\">(<a href="
 "\"#whycare\">#whycare</a>)</span>"
@@ -645,7 +659,7 @@
 "为什么名称是重要的?<span class=\"anchor-reference-id\">(<a 
href=\"#whycare"
 "\">#whycare</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Although the developers of Linux, the kernel, are contributing to the free "
 "software community, many of them do not care about freedom.  People who "
@@ -657,7 +671,7 @@
 "为整个系统就是Linux的人往往弄混淆了,他们赋予了这些内
核开发者实际上他们在社区"
 "中根本没有扮演的历史角色。然后,他们就给这些开发者
的观点以超乎寻常的份量。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Calling the system GNU/Linux recognizes the role that our idealism played in "
 "building our community, and <a href=\"/gnu/why-gnu-linux.html\">helps the "
@@ -666,7 +680,7 @@
 
"称该系统为GNU/Linux确认了我们的理想在社区建设中的角色,并<a
 href=\"/gnu/why-"
 "gnu-linux.html\">帮助公众了解这些理念的实际重要性</a>。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the real relationship between GNU and Linux? <span class=\"anchor-"
 "reference-id\">(<a href=\"#what\">#what</a>)</span>"
@@ -674,7 +688,7 @@
 "GNU和Linux究竟是什么关系?<span class=\"anchor-reference-id\">(<a 
href="
 "\"#what\">#what</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU operating system and the Linux kernel are separate software projects "
 "that do complementary jobs.  Typically they are packaged in a <a href=\"/"
@@ -683,7 +697,7 @@
 "GNU操作系统和Linux内æ 
¸æ˜¯ç‹¬ç«‹çš„软件项目,它们完成互补的工作。通常,它们会打åŒ
…"
 "在<a 
href=\"/distros/distros.html\">GNU/Linux发行版</a>里,并被一起使用。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How did it come about that most people call the system &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#howerror\">#howerror</a>)</"
@@ -692,14 +706,14 @@
 "为什么大多数人会叫该系统为&ldquo;Linux&rdquo;?<span 
class=\"anchor-"
 "reference-id\">(<a href=\"#howerror\">#howerror</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; is a confusion that has spread faster "
 "than the corrective information."
 msgstr ""
 "称该系统为&ldquo;Linux&rdquo;是一个混淆,该混淆传
播得比正确的信息要快。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who combined Linux with the GNU system were not aware that that's "
 "what their activity amounted to.  They focused their attention on the piece "
@@ -714,7 +728,7 @@
 "Linux&rdquo;,虽然这个名字并不适合他们所获得的系统。几
年后我们才意识到这个问"
 "题,并请求人们更改。那时,这个混淆已经遥遥领先了。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the people who call the system &ldquo;Linux&rdquo; have never heard "
 "why that's not the right thing.  They saw others using that name and assume "
@@ -730,13 +744,13 @@
 "相信系统的开发是由Linus 
Torvalds在1991年开始的。这个错误的场景又会加强系统应"
 "该叫做&ldquo;Linux&rdquo;的想法。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Many of the questions in this file represent people's attempts to justify "
 "the name they are accustomed to using."
 msgstr "本文中的许多问题表达了人们想要为他们习
以为常的名字辩护的诉求。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we always say &ldquo;GNU/Linux&rdquo; instead of &ldquo;Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
@@ -744,7 +758,7 @@
 
"我们是否总要说&ldquo;GNU/Linux&rdquo;而不要说&ldquo;Linux&rdquo;?<span
 "
 "class=\"anchor-reference-id\">(<a href=\"#always\">#always</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not always&mdash;only when you're talking about the whole system.  When "
 "you're referring specifically to the kernel, you should call it &ldquo;"
@@ -753,7 +767,7 @@
 "不是总要&mdash;只有当我们在谈论整个系统时。如果你
特指内核,那么你应该说"
 "&ldquo;Linux&rdquo;,其开发者选择的名字。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When people call the whole system &ldquo;Linux&rdquo;, as a consequence they "
 "call the whole system by the same name as the kernel.  This causes many "
@@ -767,7 +781,7 @@
 "是整个系统。把整个系统称为&ldquo;GNU/Linux&rdquo;,并把内æ 
¸ç§°ä¸º&ldquo;"
 "Linux&rdquo;,你就避免了歧义。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Would Linux have achieved the same success if there had been no GNU? <span "
 "class=\"anchor-reference-id\">(<a href=\"#linuxalone\">#linuxalone</a>)</"
@@ -776,7 +790,7 @@
 "如果没有GNU,Linux还会这么成功吗?<span 
class=\"anchor-reference-id\">(<a "
 "href=\"#linuxalone\">#linuxalone</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In that alternative world, there would be nothing today like the GNU/Linux "
 "system, and probably no free operating system at all.  No one attempted to "
@@ -788,7 +802,7 @@
 "操作系统。除了GNU工程和(后来的)Berkeley 
CSRG,在20世纪80年代没有人会开发自"
 "由的操作系统,CSRG也是在GNU工程的明确请求下开始代ç 
è‡ªç”±åŒ–的。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds was partly influenced by a speech about GNU in Finland in "
 "1990.  It's possible that even without this influence he might have written "
@@ -800,7 +814,7 @@
 "也可能会写出一个类Unix的内æ 
¸ï¼Œä½†æ˜¯å®ƒå¯èƒ½ä¸ä¼šæ˜¯è‡ªç”±è½¯ä»¶ã€‚Linux在1992年,当"
 "Linus把它按GNU 
GPL发布时,成为自由软件。(参看0.12版的发布说明。)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Even if Torvalds had released Linux under some other free software license, "
 "a free kernel alone would not have made much difference to the world.  The "
@@ -811,7 +825,7 @@
 "Linux正好适合一个更大的框架、一个完å…
¨çš„自由操作系统:GNU/Linux,这样它才变得"
 "显眼。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better for the community if you did not divide people with "
 "this request? <span class=\"anchor-reference-id\">(<a href=\"#divide"
@@ -820,7 +834,7 @@
 "如果你们不按这æ 
·çš„要求分裂人群,对社区不是更好吗?<span class=\"anchor-"
 "reference-id\">(<a href=\"#divide\">#divide</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "When we ask people to say &ldquo;GNU/Linux&rdquo;, we are not dividing "
 "people.  We are asking them to give the GNU Project credit for the GNU "
@@ -829,7 +843,7 @@
 
"当我们请求人们说&ldquo;GNU/Linux&rdquo;时,我们不是在分裂群众。我们是在请求他"
 
"们给予GNU操作系统的GNU工程荣誉。这并没有批评或驱赶任何人。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, there are people who do not like our saying this.  Sometimes those "
 "people push us away in response.  On occasion they are so rude that one "
@@ -841,7 +855,7 @@
 
"是如此粗鲁以至于我们不得不想,他们是不是存心要胁迫我们保持沉默。这没有使我们"
 "沉默,但是这确实要分裂社区,所以我们希望你
们能够说服他们不要这样做。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, this is only a secondary cause of division in our community.  The "
 "largest division in the community is between people who appreciate free "
@@ -854,7 +868,7 @@
 
"道德问题并认为专属软件是社会问题的人(自由软件运动的支持è€
…)和那些只讨论实际"
 "利益并只把自由软件当作有效的开发模式的人(开源运动者
)之间的分裂。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This disagreement is not just a matter of names&mdash;it is a matter of "
 "differing basic values.  It is essential for the community to see and think "
@@ -868,7 +882,7 @@
 "帜。请参看<a 
href=\"/philosophy/open-source-misses-the-point.html\">为什么开"
 "源错失了自由软件的重点</a>。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The disagreement over values partially aligns with the amount of attention "
 "people pay to the GNU Project's role in our community.  People who value "
@@ -888,7 +902,7 @@
 "名称,分歧也可能还会存在,因
为问题真的在那里。只有看重自由的我们说服每个人"
 "(不太容易)或者我们被完å…
¨æ‰“败(希望不要如此),问题才会消失。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Doesn't the GNU project support an individual's free speech rights to call "
 "the system by any name that individual chooses? <span class=\"anchor-"
@@ -897,7 +911,7 @@
 
"难道GNU工程不支持每个人按自己的选择为系统命名的言论自由吗?<span
 class="
 "\"anchor-reference-id\">(<a href=\"#freespeech\">#freespeech</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Yes, indeed, we believe you have a free speech right to call the operating "
 "system by any name you wish.  We ask that people call it GNU/Linux as a "
@@ -909,7 +923,7 @@
 "家称之为GNU/Linux是为了公正地对待
GNU工程、是为了促进GNU代表的自由价值、是为了"
 "告诉大家正是这些自由价值才使该系统能够存在。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since everyone knows the role of GNU in developing the system, doesn't the "
 "&ldquo;GNU/&rdquo; in the name go without saying? <span class=\"anchor-"
@@ -919,7 +933,7 @@
 "样吗?<span class=\"anchor-reference-id\">(<a href=\"#everyoneknows"
 "\">#everyoneknows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Experience shows that the system's users, and the computer-using public in "
 "general, often know nothing about the GNU system.  Most articles about the "
@@ -932,7 +946,7 @@
 
"gnu-users-never-heard-of-gnu.html\">从未听说过GNU的GNU用户</a>一文有更详细的"
 "解释。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who say this are probably geeks thinking of the geeks they know.  "
 "Geeks often do know about GNU, but many have a completely wrong idea of what "
@@ -944,7 +958,7 @@
 "许多人认为GNU是一个<a href=\"#tools\">&ldquo;å·¥å…
·&rdquo;</a>集合,或者GNU是一"
 "个开发工具的项目。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The wording of this question, which is typical, illustrates another common "
 "misconception.  To speak of &ldquo;GNU's role&rdquo; in developing something "
@@ -956,7 +970,7 @@
 
"&rdquo;时认为GNU是一群人。GNU是一个操作系统。讨论GNU工程的角色或å
…¶ä»–活动才有"
 "意义,而不是谈论GNU。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since I know the role of GNU in this system, why does it matter what name I "
 "use? <span class=\"anchor-reference-id\">(<a href="
@@ -965,7 +979,7 @@
 "我了解GNU在系统中的角色,为什么我用什么名字还有å…
³ç³»ï¼Ÿ<span class=\"anchor-"
 "reference-id\">(<a href=\"#everyoneknows2\">#everyoneknows2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If your words don't reflect your knowledge, you don't teach others.  Most "
 "people who have heard of the GNU/Linux system think it is &ldquo;"
@@ -976,7 +990,7 @@
 "统的人认为这就是&ldquo;Linux&rdquo;,而它是由Linus 
Torvalds开始的,并且它要做"
 "的是&ldquo;开源&rdquo;。如果你
不告诉人们事实,谁来告诉他们呢?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't shortening &ldquo;GNU/Linux&rdquo; to &ldquo;Linux&rdquo; just like "
 "shortening &ldquo;Microsoft Windows&rdquo; to &ldquo;Windows&rdquo;? <span "
@@ -986,13 +1000,13 @@
 "Windows&rdquo;缩写&ldquo;Windows&rdquo;类似吗?<span class=\"anchor-"
 "reference-id\">(<a href=\"#windows\">#windows</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It's useful to shorten a frequently-used name, but not if the abbreviation "
 "is misleading."
 msgstr 
"把一个常用名称缩写是有用的,但是该缩写不能引起误解。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Almost everyone in developed countries really does know that the &ldquo;"
 "Windows&rdquo; system is made by Microsoft, so shortening &ldquo;Microsoft "
@@ -1005,7 +1019,7 @@
 
"Windows&rdquo;不会使人们误解该系统的属性和来源。但是,把&ldquo;GNU/"
 "Linux&rdquo;缩写为&ldquo;Linux&rdquo;的确误导了该系统的起源。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The question is itself misleading because GNU and Microsoft are not the same "
 "kind of thing.  Microsoft is a company; GNU is an operating system."
@@ -1013,7 +1027,7 @@
 "此问题本身就具有误导性,因
为GNU和Microsoft并不类似。Microsoft是一家公司;GNU"
 "是一个操作系统。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't GNU a collection of programming tools that were included in Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
@@ -1021,7 +1035,7 @@
 "难道GNU作为编程工具的集合不是包含在Linux之中了?<span 
class=\"anchor-"
 "reference-id\">(<a href=\"#tools\">#tools</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "People who think that Linux is an entire operating system, if they hear "
 "about GNU at all, often get a wrong idea of what GNU is.  They may think "
@@ -1036,7 +1050,7 @@
 "&rdquo;,因为我们的一些编程工å…
·æœ¬èº«ä¹Ÿæ‹›äººå–œæ¬¢ã€‚&ldquo;GNU&rdquo;就是操作系统"
 "的名字这一概念很难被贴上&ldquo;Linux&rdquo;æ 
‡ç­¾çš„操作系统这一概念所接纳."
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Project was named after the GNU operating system&mdash;it's the "
 "project to develop the GNU system.  (See <a href=\"/gnu/initial-announcement."
@@ -1045,7 +1059,7 @@
 
"GNU工程由于GNU操作系统而得名&mdash;它是开发GNU系统的工程。(请参看<a
 href=\"/"
 "gnu/initial-announcement.html\">1983的初始声明</a>。)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We developed programs such as GCC, GNU Emacs, GAS, GLIBC, BASH, etc., "
 "because we needed them for the GNU operating system.  GCC, the GNU Compiler "
@@ -1057,7 +1071,7 @@
 
"们。GCC,GNU编译器集合是我们为GNU操作系统编写的编译器。我们,为GNU工程工作的"
 "一群人,也为GNU工程开发了Ghostscript、GNUCash、GNU 
Chess和GNOME。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "What is the difference between an operating system and a kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#osvskernel\">#osvskernel</a>)</span>"
@@ -1065,7 +1079,7 @@
 "操作系统和内核有什么不同?<span 
class=\"anchor-reference-id\">(<a href="
 "\"#osvskernel\">#osvskernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "An operating system, as we use the term, means a collection of programs that "
 "are sufficient to use the computer to do a wide variety of jobs.  A general "
@@ -1076,7 +1090,7 @@
 
"务。一个通用的操作系统,如果是完备的,就应该能够处理许多用户想要完成的所有任"
 "务。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The kernel is one of the programs in an operating system&mdash;the program "
 "that allocates the machine's resources to the other programs that are "
@@ -1085,7 +1099,7 @@
 "内核是操作系统的程序之一&mdash;它为其他程序的运行分é…
æœºå™¨çš„资源。内核也负责开"
 "始和终止其他程序。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "To confuse matters, some people use the term &ldquo;operating system&rdquo; "
 "to mean &ldquo;kernel&rdquo;.  Both uses of the term go back many years.  "
@@ -1103,7 +1117,7 @@
 "甚至还包
括游戏。由于我们意在使GNU成为一个类Unix的操作系统,所以我们在使用"
 "&ldquo;操作系统&rdquo;一词时是指和Unix一样的意思。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Most of the time when people speak of the &ldquo;Linux operating "
 "system&rdquo; they are using &ldquo;operating system&rdquo; in the same "
@@ -1118,7 +1132,7 @@
 "请叫它&ldquo;GNU/Linux&rdquo;。如果你只是指内æ 
¸ï¼Œé‚£ä¹ˆ&ldquo;Linux&rdquo;是正"
 "确的名字,但是请你也加上&ldquo;内核&rdquo;来避免混淆你
要指明的程序。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you prefer to use some other term such as &ldquo;system "
 "distribution&rdquo; for the entire collection of programs, instead of &ldquo;"
@@ -1128,7 +1142,7 @@
 "如果你
更爱使用诸如&ldquo;系统发行版&rdquo;之类的词来表示整个系统集合,而不用"
 "&ldquo;操作系统&rdquo;一词,也没问题。这时,你
可能应该说GNU/Linux系统发行版。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The kernel of a system is like the foundation of a house.  How can a house "
 "be almost complete when it doesn't have a foundation? <span class=\"anchor-"
@@ -1137,13 +1151,13 @@
 "系统的内æ 
¸æ­£å¦‚房屋的基础。在没有基础的时候,房屋怎么就几
乎完成了?<span "
 "class=\"anchor-reference-id\">(<a href=\"#house\">#house</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "A kernel is not much like the foundation of a house because building an "
 "operating system is not much like building a house."
 msgstr "内核并不像房屋的基础,因
为构建操作系统并不像建造房屋一样。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A house is built from lots of little general parts that are cut and put "
 "together in situ.  They have to be put together from the bottom up.  Thus, "
@@ -1154,7 +1168,7 @@
 "而上组装在一起。因此,如果根基没有建好,你无法建造å…
¶ä»–部分;你只能看到一个地"
 "坑。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "By contrast, an operating system consists of complex components that can be "
 "developed in any order.  When you have developed most of the components, "
@@ -1168,7 +1182,7 @@
 "果空间站的大多数部件都进å…
¥è½¨é“,只是在等一两个重要模块,那么这就类似GNU系统在"
 "1992年的情形。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't the kernel the brain of the system? <span class=\"anchor-reference-id"
 "\">(<a href=\"#brain\">#brain</a>)</span>"
@@ -1176,13 +1190,13 @@
 "内核不是系统的大脑吗?<span class=\"anchor-reference-id\">(<a 
href=\"#brain"
 "\">#brain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "A computer system is not much like a human body, and no part of it plays a "
 "role comparable to that of the brain in a human."
 msgstr "电脑系统和人体不一样,其中没有一个部件担
当和人脑一样的角色。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't writing the kernel most of the work in an operating system? <span "
 "class=\"anchor-reference-id\">(<a href=\"#kernelmost\">#kernelmost</a>)</"
@@ -1191,11 +1205,11 @@
 "编写内核不是构建操作系统的主要工作吗?<span 
class=\"anchor-reference-id\">"
 "(<a href=\"#kernelmost\">#kernelmost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "No, many components take a lot of work."
 msgstr "不,许多部件都要花费大量的劳动。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "An operating system requires a kernel.  Since the GNU Project didn't develop "
 "a kernel, how can the system be GNU?<span class=\"anchor-reference-id\">(<a "
@@ -1205,7 +1219,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#nokernel\">#nokernel</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The people who argue that way for calling the system &ldquo;Linux&rdquo; are "
 "using a double standard.  An operating system requires compilers, editors, "
@@ -1218,13 +1232,13 @@
 "拿 1983 年的 BSD 系统做对照也是这样。Torvalds å…
ˆç”Ÿä¹Ÿæ²¡æœ‰å¼€å‘这些程序,系统怎"
 "么能叫 &ldquo;Linux&rdquo; 呢?"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "That standard is too strict, not the right way to judge the contributions of "
 "any contributor."
 msgstr "这个标准太严格,它并不是判断贡献者
贡献大小的好办法。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linus Torvalds made an important contribution to the operating system we "
 "use; the GNU Project started earlier and contributed much more.  The name "
@@ -1233,7 +1247,7 @@
 "Linus Torvalds 对这个操作系统做出了重要贡献;GNU 
工程开始得更早、贡献也更多。"
 "&ldquo;GNU/Linux&rdquo; 这个名字给了双方荣誉。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How can GNU be an operating system, if I can't get something called &ldquo;"
 "GNU&rdquo; and install it? <span class=\"anchor-reference-id\">(<a href="
@@ -1243,7 +1257,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#notinstallable"
 "\">#notinstallable</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Many <a href=\"/distros/distros.html\"> packaged and installable versions of "
 "GNU</a> are available.  None of them is called simply &ldquo;GNU&rdquo;, but "
@@ -1252,7 +1266,7 @@
 "有许多<a href=\"/distros/distros.html\">打好包的、可安装
的GNU版本</a>。它们都"
 "不是简单地叫做&ldquo;GNU&rdquo;,但是它们基本上就是GNU。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We expected to release the GNU system packaged for installation, but this "
 "plan was overtaken by events: in 1992 others were already packaging GNU "
@@ -1270,7 +1284,7 @@
 "&ldquo;GNU&rdquo;,因为GNU这个名字将用于带GNU Hurd内æ 
¸çš„系统版本&mdash;当时还"
 "未就绪。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The GNU Hurd kernel never became sufficiently ready; we only recommend it to "
 "those interested in working on it.  So we never packaged GNU with the GNU "
@@ -1280,7 +1294,7 @@
 "我们没有将GNU和GNU Hurd内核一起打包。不过,Debian打包
的Debian GNU/Hurd就是这"
 "个组合。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are now developing an advanced Scheme-based package manager called Guix "
 "and a complete system distribution based on it called the <a href=\"/"
@@ -1291,7 +1305,7 @@
 "完整系统发行版,叫做<a 
href=\"/software/guix\">Guix系统发行版</a>或GuixSD。它"
 "重新打包了大量的GNU系统的软件包。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We never took the last step of packaging GNU under the name &ldquo;"
 "GNU&rdquo;, but that doesn't alter what kind of thing GNU is.  GNU is an "
@@ -1300,7 +1314,7 @@
 "我们从来没有踏出最后一步&mdash;用&ldquo;GNU&rdquo;之名打包
GNU,但是这并不改变"
 "GNU的本质。GNU是一个操作系统。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "We're calling the whole system after the kernel, Linux.  Isn't it normal to "
 "name an operating system after a kernel? <span class=\"anchor-reference-id\">"
@@ -1309,7 +1323,7 @@
 "我们用内核来称呼整个系统,Linux。用内æ 
¸å‘½åæ“ä½œç³»ç»Ÿä¸æ˜¯æ­£å¸¸çš„吗?<span class="
 "\"anchor-reference-id\">(<a href=\"#afterkernel\">#afterkernel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "That practice seems to be very rare&mdash;we can't find any examples other "
 "than the misuse of the name &ldquo;Linux&rdquo;.  Normally an operating "
@@ -1323,7 +1337,7 @@
 "系统选择一个名字。内æ 
¸é€šå¸¸æ²¡æœ‰è‡ªå·±çš„名字&mdash;反过来,人们会说&ldquo;某某系"
 "统的内核&rdquo;或者是&ldquo;某某的系统内核&rdquo;。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Because those two constructions are used synonymously, the expression &ldquo;"
 "the Linux kernel&rdquo; can easily be misunderstood as meaning &ldquo;the "
@@ -1335,7 +1349,7 @@
 "的内核&rdquo;并暗示Linux必定不单单是一个内核。你
可以通过说或者写&ldquo;该内"
 "核,Linux&rdquo;或&ldquo;Linux,内核&rdquo;来避å…
å¤§å®¶å¯èƒ½çš„误解。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can another system have &ldquo;the feel of Linux&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#feel\">#feel</a>)</span>"
@@ -1343,7 +1357,7 @@
 "另外的系统能不能有&ldquo;Linux的感觉&rdquo;?<span 
class=\"anchor-reference-"
 "id\">(<a href=\"#feel\">#feel</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is no such thing as the &ldquo;feel of Linux&rdquo; because Linux has "
 "no user interfaces.  Like any modern kernel, Linux is a base for running "
@@ -1355,7 +1369,7 @@
 "代内核一æ 
·ï¼ŒLinux是运行程序的基础;用户界面属于系统的å…
¶ä»–部分。人们在GNU/"
 "Linux上的交互总是通过å…
¶ä»–程序,而这就是&ldquo;感觉&rdquo;的来源。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  How about "
 "recommending a shorter name? <span class=\"anchor-reference-id\">(<a href="
@@ -1364,7 +1378,7 @@
 "问题是&ldquo;GNU/Linux&rdquo;太长了。用一个更短的名字怎么æ 
·ï¼Ÿ<span class="
 "\"anchor-reference-id\">(<a href=\"#long\">#long</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "For a while we tried the name &ldquo;LiGNUx&rdquo;, which combines the words "
 "&ldquo;GNU&rdquo; and &ldquo;Linux&rdquo;.  The reaction was very bad.  "
@@ -1373,7 +1387,7 @@
 
"有段时间,我们用了&ldquo;LiGNUx&rdquo;这个名字,它合并了&ldquo;GNU&rdquo;和"
 
"&ldquo;Linux&rdquo;两个词。反应很不好。人们更接受&ldquo;GNU/Linux&rdquo;。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The shortest legitimate name for this system is &ldquo;GNU&rdquo;, but we "
 "call it &ldquo;GNU/Linux&rdquo; <a href=\"#justgnu\"> for the reasons given "
@@ -1382,7 +1396,7 @@
 
"该系统最短的合法名称是&ldquo;GNU&rdquo;,不过我们称之为&ldquo;GNU/"
 "Linux&rdquo;,<a href=\"#justgnu\">道理如下</a>。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How about calling the system &ldquo;GliNUx&rdquo; (instead of &ldquo;GNU/"
 "Linux&rdquo;)? <span class=\"anchor-reference-id\">(<a href="
@@ -1391,7 +1405,7 @@
 "该系统叫&ldquo;GliNUx&rdquo;(替换掉&ldquo;GNU/Linux&rdquo;)怎么æ 
·ï¼Ÿ<span "
 "class=\"anchor-reference-id\">(<a href=\"#long1\">#long1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The name &ldquo;GNU&rdquo; does not visibly appear in &ldquo;Glinux,&rdquo; "
 "so most people would not notice it is there.  Even if it is capitalized as "
@@ -1402,7 +1416,7 @@
 
"不会注意到GNU。即使写成大写的&ldquo;GliNUx,&rdquo;,大多数人也不会意识到这是"
 "在说GNU。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be comparable to writing &ldquo;GNU/Linux,&rdquo; but putting "
 "&ldquo;GNU/&rdquo; in print so small that most people could not read it."
@@ -1410,7 +1424,7 @@
 
"它就像是在写&ldquo;GNU/Linux,&rdquo;,但是把&ldquo;GNU/&rdquo;写得很小,而让"
 "大多数人根本看不到它。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The problem with &ldquo;GNU/Linux&rdquo; is that it is too long.  Why should "
 "I go to the trouble of saying &ldquo;GNU/&rdquo;? <span class=\"anchor-"
@@ -1419,7 +1433,7 @@
 
"问题是&ldquo;GNU/Linux&rdquo;太长了。为什么我要自找麻烦说&ldquo;GNU/&rdquo;?"
 "<span class=\"anchor-reference-id\">(<a href=\"#long2\">#long2</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It only takes a second to say or type &ldquo;GNU/&rdquo;.  If you appreciate "
 "the system that we developed, can't you take one second to recognize our "
@@ -1428,7 +1442,7 @@
 "说出或者写出&ldquo;GNU/&rdquo;只需一秒钟。如果你
对我们开发的系统心怀感激,难"
 "道你不愿意花一秒钟来表示肯定?"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Unfortunately, &ldquo;GNU/Linux&rdquo; is five syllables. People won't use "
 "such a long term. Shouldn't you find a shorter one? <span class=\"anchor-"
@@ -1438,7 +1452,7 @@
 "不该找个更短的术语?<span class=\"anchor-reference-id\">(<a href="
 "\"#long3\">#long3</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually, &ldquo;GNU/Linux&rdquo; is only four syllables.  &ldquo;"
 "Unfortunately&rdquo; is five syllables, yet people show no sign of "
@@ -1447,7 +1461,7 @@
 "实际
上,&ldquo;GNU/Linux&rdquo;只有四个音节。&ldquo;Unfortunately(不幸一词)"
 "&rdquo;有五个音节,但是人们会毫不迟疑地使用它。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Stallman doesn't ask us to call him &ldquo;Richard Matthew Stallman&rdquo; "
 "every the time.  So why ask us to say &ldquo;GNU/Linux&rdquo; every time? "
@@ -1457,7 +1471,7 @@
 "Stallman&rdquo;。那么为什么要让我们每次都说 
&ldquo;GNU/Linux&rdquo; 呢?"
 "<span class=\"anchor-reference-id\">(<a href=\"#long4\">#long4</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Omitting &ldquo;Matthew&rdquo; does not misrepresent anything important "
 "about Stallman's nature, origin, ideas or purpose.  Omitting &ldquo;"
@@ -1466,7 +1480,7 @@
 "省略 &ldquo;Matthew&rdquo; 不会严重曲解 Stallman 
的本性、来源、理想和目标。省"
 "略 &ldquo;GNU&rdquo; 确实会对 GNU/Linux 
系统的这些方面带来曲解。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is an example of a frequent way of hiding a fallacy: to bury it inside "
 "a misleading analogy.  A better analogy would be, &ldquo;Why shouldn't we "
@@ -1475,7 +1489,7 @@
 
"这是一种隐藏谬误的常见方式:将谬误埋藏在错误的类比之中。更好的类别应该是,"
 "&ldquo;为什么我们不应该叫 Stallman &lsquo;Torvalds&rsquo;?&rdquo;"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since Linux is a secondary contribution, would it be false to the facts to "
 "call the system simply &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id"
@@ -1484,7 +1498,7 @@
 
"由于Linux是次要的贡献,难道简单称该系统为&ldquo;GNU&rdquo;有错吗?<span
 "
 "class=\"anchor-reference-id\">(<a href=\"#justgnu\">#justgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would not be false to the facts, but it is not the best thing to do.  "
 "Here are the reasons we call that system version &ldquo;GNU/Linux&rdquo; "
@@ -1493,7 +1507,7 @@
 
"虽然这么说没错,但是这么做未见得最好。这里讲一下我们称整个系统版本为&ldquo;"
 "GNU/Linux&rdquo;而不仅仅是&ldquo;GNU&rdquo;的原因:"
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It's not exactly GNU&mdash;it has a different kernel (that is, Linux).  "
 "Distinguishing GNU/Linux from GNU is useful."
@@ -1501,7 +1515,7 @@
 "它不是严格意义上的GNU&mdash;它带有不同的内æ 
¸ï¼ˆå°±æ˜¯ï¼ŒLinux)。区分GNU/Linux和"
 "GNU是有用的。"
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "It would be ungentlemanly to ask people to <em>stop</em> giving any credit "
 "to Linus Torvalds.  He did write an important component of the system.  We "
@@ -1518,7 +1532,7 @@
 "他的政治观点,但是我们对此采取真诚和å…
¬å¼€çš„做法,而不是试图削弱他在系统贡献方"
 "面应得的荣誉。"
 
-#. type: Content of: <div><div><dl><dd><ul><li>
+#. type: Content of: <div><dl><dd><ul><li>
 msgid ""
 "Since many people know of the system as &ldquo;Linux&rdquo;, if we say "
 "&ldquo;GNU&rdquo; they may simply not recognize we're talking about the same "
@@ -1529,7 +1543,7 @@
 
"他们可能不会意识到我们说的是同一个系统。如果我们说&ldquo;GNU/Linux&rdquo;,他"
 "们就能够和他们原先听说的系统建立联系。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "I would have to pay a fee if I use &ldquo;Linux&rdquo; in the name of a "
 "product, and that would also apply if I say &ldquo;GNU/Linux&rdquo;.  Is it "
@@ -1542,7 +1556,7 @@
 "用?<span class=\"anchor-reference-id\">(<a href=\"#trademarkfee"
 "\">#trademarkfee</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There's nothing wrong in calling the system &ldquo;GNU&rdquo;; basically, "
 "that's what it is.  It is nice to give Linus Torvalds a share of the credit "
@@ -1551,7 +1565,7 @@
 
"将该系统叫做&ldquo;GNU&rdquo;并没有错;基本上,该系统就是这æ
 ·çš„。给予Linus "
 "Torvalds应得的荣誉也很好,但是你
并没有义务要为此支付费用。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "So if you want to refer to the system simply as &ldquo;GNU&rdquo;, to avoid "
 "paying the fee for calling it &ldquo;Linux&rdquo;, we won't criticize you."
@@ -1559,7 +1573,7 @@
 "所以如果你想简单称该系统为&ldquo;GNU&rdquo;,并以此避免因
为叫它&ldquo;"
 "Linux&rdquo;而付费,我们不会指责你。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today; it includes "
 "TeX, X11, Apache, Perl, and many more programs.  Don't your arguments imply "
@@ -1572,7 +1586,7 @@
 "了。)<span class=\"anchor-reference-id\">(<a href=\"#many\">#many</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "What we say is that you ought to give the system's principal developer a "
 "share of the credit.  The principal developer is the GNU Project, and the "
@@ -1581,7 +1595,7 @@
 "我们说的是你应该给予系统的主要开发者
应得的荣誉。主要开发者就是GNU工程,而且该"
 "系统基本上就是GNU。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you feel even more strongly about giving credit where it is due, you "
 "might feel that some secondary contributors also deserve credit in the "
@@ -1595,7 +1609,7 @@
 "在系统名称中,而且你
想称之为GNU/X11/Linux,没问题。如果你觉得Perl也值得致意,"
 "而且想把系统名称写成GNU/Linux/Perl,尽管去做吧。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Since a long name such as GNU/X11/Apache/Linux/TeX/Perl/Python/FreeCiv "
 "becomes absurd, at some point you will have to set a threshold and omit the "
@@ -1607,7 +1621,7 @@
 "以你终究会限制一个长度而许多次要的贡献将无法写å…
¥è¯¥åç§°ã€‚因为限制长度并没有明"
 "显的对错,所以无论你怎么做,我们都不会反对。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Different threshold levels would lead to different choices of name for the "
 "system.  But one name that cannot result from concerns of fairness and "
@@ -1619,7 +1633,7 @@
 "因为考虑到å…
¬å¹³å’Œè£èª‰è€Œå‡ºçŽ°çš„,它就是&ldquo;Linux&rdquo;。给予一个次要贡献è€
…"
 "(Linux)所有的荣誉而忽略主要的贡献者(GNU)不可能是å…
¬å¹³çš„。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "systemd plays an important role in the GNU/Linux system as it is today; are "
 "we obligated to call it GNU/systemd/Linux? <span class=\"anchor-reference-id"
@@ -1629,7 +1643,7 @@
 "GNU/Systemd/Linux 呢?<span class=\"anchor-reference-id\">(<a href=\"others"
 "\">#others</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "systemd is a fairly important component, but not as important as the kernel "
 "(Linux), nor as important as the basis of the system as a whole (GNU).  "
@@ -1640,7 +1654,7 @@
 "统的基础(GNU)那么重要。不过,如果你强调系统中有 
Systemd 并且称之为 &ldquo;"
 "GNU/Systemd/Linux&rdquo;,也没有什么错误。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many other projects contributed to the system as it is today, but they don't "
 "insist on calling it XYZ/Linux.  Why should we treat GNU specially? <span "
@@ -1650,7 +1664,7 @@
 "要对GNU特殊对待呢?<span class=\"anchor-reference-id\">(<a 
href=\"#others"
 "\">#others</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Thousands of projects have developed programs commonly included in today's "
 "GNU/Linux systems.  They all deserve credit for their contributions, but "
@@ -1660,7 +1674,7 @@
 "今天的GNU/Linux系统通常包
含有数千个项目开发的程序。它们的贡献都应该得到荣誉,"
 "但是整体来看它们不是系统的主要开发者
,所以它们没有要求类似的荣誉。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is different because it is more than just a contributed program, more "
 "than just a collection of contributed programs.  GNU is the framework on "
@@ -1669,7 +1683,7 @@
 "GNU不同,因
为它的贡献不只是一个程序,也不只是一个程序集合。GNU是整个系统得以"
 "构建的框架。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "GNU is a small fraction of the system nowadays, so why should we mention it? "
 "<span class=\"anchor-reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</"
@@ -1678,7 +1692,7 @@
 
"如今,GNU只是系统的一小部分,为什么我们要提及它呢?<span
 class=\"anchor-"
 "reference-id\">(<a href=\"#allsmall\">#allsmall</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "In 2008, we found that GNU packages made up 15% of the &ldquo;main&rdquo; "
 "repository of the gNewSense GNU/Linux distribution.  Linux made up 1.5%.  So "
@@ -1689,7 +1703,7 @@
 "15%的份额。Linux占有1.5%的份额。所以,同æ 
·çš„争议对&ldquo;Linux&rdquo;这一名称"
 "更有挑战性。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is a small fraction of the system nowadays, and Linux is an even smaller "
 "fraction.  But they are the system's core; the system was made by combining "
@@ -1698,7 +1712,7 @@
 
"今天,GNU是系统的一小部分,而Linux就更小了。但是他们是系统的æ
 ¸å¿ƒï¼›ç³»ç»Ÿç”±äºŒè€…"
 "合并而成。因此,称之为&ldquo;GNU/Linux&rdquo;还是合适的。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many companies contributed to the system as it is today; doesn't that mean "
 "we ought to call it GNU/Red&nbsp;Hat/Novell/Linux? <span class=\"anchor-"
@@ -1708,7 +1722,7 @@
 "Linux?<span class=\"anchor-reference-id\">(<a href=\"#manycompanies"
 "\">#manycompanies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is not comparable to Red Hat or Novell; it is not a company, or an "
 "organization, or even an activity.  GNU is an operating system.  (When we "
@@ -1720,7 +1734,7 @@
 
"活动。GNU是一个操作系统。(当我们说GNU工程时,我们指的是开发GNU系统的工程。)"
 
"GNU/Linux系统基于GNU,而这就是为什么GNU应该出现在系统名称里。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Much of those companies' contribution to the GNU/Linux system lies in the "
 "code they have contributed to various GNU packages including GCC and GNOME.  "
@@ -1730,7 +1744,7 @@
 "这些公司对GNU/Linux系统的贡献在于他们对多个GNU包的代ç 
è´¡çŒ®ï¼Œå…¶ä¸­åŒ…括GCC和"
 "GNOME。命名GNU/Linux就是给予这些公司以及所有其他GNU开发者
荣誉。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU/Linux&rdquo; instead of &ldquo;GNU Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</"
@@ -1739,7 +1753,7 @@
 "为什么要写成&ldquo;GNU/Linux&rdquo;而不是&ldquo;GNU 
Linux&rdquo;?<span "
 "class=\"anchor-reference-id\">(<a href=\"#whyslash\">#whyslash</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Linux&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Linux&rdquo;.  This can mean "
@@ -1750,7 +1764,7 @@
 "&ldquo;Linux&rdquo;。它或者是说&ldquo;GNU版的Linux&rdquo;,或者
是说&ldquo;"
 "Linux,是一个GNU包。&rdquo;哪个意思都不适合当下的情况。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is not a GNU package; that is, it wasn't developed under the GNU "
 "Project's aegis or contributed specifically to the GNU Project.  Linus "
@@ -1761,14 +1775,24 @@
 "GNU工程的。Linus 
Torvalds独立编写了Linux,作为他自己的项目。所以&ldquo;"
 "Linux,是一个GNU包&rdquo;的说法不对。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "We're not talking about a distinct GNU version of Linux, the kernel.  The "
+#| "free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/";
+#| "project/linux\">separate version of Linux</a>, since the &ldquo;"
+#| "standard&rdquo; version contains non-free firmware &ldquo;blobs&rdquo;.  "
+#| "If this were part of the GNU Project, it could be considered &ldquo;GNU "
+#| "Linux&rdquo;; but we would not want to call it that, because it would be "
+#| "too confusing."
 msgid ""
 "We're not talking about a distinct GNU version of Linux, the kernel.  The "
-"free GNU/Linux distros do have a <a href=\"http://directory.fsf.org/project/";
-"linux\">separate version of Linux</a>, since the &ldquo;standard&rdquo; "
-"version contains non-free firmware &ldquo;blobs&rdquo;.  If this were part "
-"of the GNU Project, it could be considered &ldquo;GNU Linux&rdquo;; but we "
-"would not want to call it that, because it would be too confusing."
+"free GNU/Linux distros do have a <a href=\"https://directory.fsf.org/wiki/";
+"Linux-libre\">separate version of Linux</a>, since the &ldquo;"
+"standard&rdquo; version contains nonfree firmware &ldquo;blobs&rdquo;.  If "
+"this were part of the GNU Project, it could be considered &ldquo;GNU "
+"Linux&rdquo;; but we would not want to call it that, because it would be too "
+"confusing."
 msgstr ""
 "我们不是在讨论特别针对GNU的Linux内æ 
¸ç‰ˆæœ¬ã€‚GNU/Linux发行版确实有一个<a href="
 
"\"http://directory.fsf.org/project/linux\";>独立的Linux版本</a>,这是由于"
@@ -1776,7 +1800,7 @@
 "程的一部分,那么可以考虑叫它&ldquo;GNU 
Linux&rdquo;;不过我们不想这么叫,因为"
 "这太令人迷惑了。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We're talking about a version of GNU, the operating system, distinguished by "
 "having Linux as the kernel.  A slash fits the situation because it means "
@@ -1787,7 +1811,7 @@
 "杠适合此情况,因
为它表示&ldquo;联合。&rdquo;(类似&ldquo;输入/输出&rdquo;。)"
 "该系统是GNU和Linux的联合;因此,它叫&ldquo;GNU/Linux&rdquo;。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are other ways to express &ldquo;combination&rdquo;.  If you think "
 "that a plus-sign is clearer, please use that.  In French, a hyphen is clear: "
@@ -1798,7 +1822,7 @@
 "语中,横线就很清
楚:&ldquo;GNU-Linux&rdquo;。在西班牙语中,我们有时说&ldquo;"
 "GNU con Linux&rdquo;。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How is the name &ldquo;GNU/Linux&rdquo; pronounced? <span class=\"anchor-"
 "reference-id\">(<a href=\"#pronounce\">#pronounce</a>)</span>"
@@ -1806,7 +1830,7 @@
 "&ldquo;GNU/Linux&rdquo; 应该怎么念?<span 
class=\"anchor-reference-id\">(<a "
 "href=\"#pronounce\">#pronounce</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please pronounce it as &ldquo;GNU slash Linux.&rdquo; If you don't pronounce "
 "the slash, people will think you are saying &ldquo;GNU Linux,&rdquo; which "
@@ -1816,7 +1840,7 @@
 "在说 &ldquo;GNU Linux&rdquo;,这其实 <a 
href=\"#whyslash\">不是一个对该组合的"
 "恰当称呼</a>。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why do you write &ldquo;GNU Emacs&rdquo; rather than &ldquo;GNU/"
 "Emacs&rdquo;? <span class=\"anchor-reference-id\">(<a href=\"#whynoslash"
@@ -1826,7 +1850,7 @@
 "class=\"anchor-reference-id\">(<a href=\"#whynoslash\">#whynoslash</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Following the rules of English, in the construction &ldquo;GNU Emacs&rdquo; "
 "the word &ldquo;GNU&rdquo; modifies &ldquo;Emacs&rdquo;.  That is the right "
@@ -1836,7 +1860,7 @@
 "词修饰 &ldquo;Emacs&rdquo;。这是描述 GNU 软件包
中有一个程序叫 Emacs 的正确方"
 "法。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "&ldquo;GNU/Emacs&rdquo; would mean the combination of GNU, the operating "
 "system, and the program Emacs.  That doesn't fit this program, so &ldquo;GNU/"
@@ -1845,7 +1869,7 @@
 "&ldquo;GNU/Emacs&rdquo; 说的是 GNU 这个操作系统和 Emacs 
这个程序的组合。这个"
 "单用来指 Emacs 程序不合适,所以 &ldquo;GNU/Emacs&rdquo; 
是一个错误的名字。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why &ldquo;GNU/Linux&rdquo; rather than &ldquo;Linux/GNU&rdquo;? <span class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
@@ -1853,7 +1877,7 @@
 "为什么是&ldquo;GNU/Linux&rdquo;而不是&ldquo;Linux/GNU&rdquo;?<span 
class="
 "\"anchor-reference-id\">(<a href=\"#whyorder\">#whyorder</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is right and proper to mention the principal contribution first.  The GNU "
 "contribution to the system is not only bigger than Linux and prior to Linux, "
@@ -1862,7 +1886,7 @@
 "首先论及主要的贡献者
是正当和合理的。GNU对系统的贡献不仅
大于Linux,而且也早于"
 "Linux。实际上,是我们发起了整个活动。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In addition, &ldquo;GNU/Linux&rdquo; fits the fact that Linux is the lowest "
 "level of the system and GNU fills technically higher levels."
@@ -1870,7 +1894,7 @@
 
"另外,&ldquo;GNU/Linux&rdquo;这个名字对Linux是系统最底层而GNU是技术面的更上层"
 "这一情况也是恰当的。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "However, if you prefer to call the system &ldquo;Linux/GNU&rdquo;, that is a "
 "lot better than what people usually do, which is to omit GNU entirely and "
@@ -1879,7 +1903,7 @@
 "不过,如果你
更愿意说&ldquo;Linux/GNU&rdquo;,这也比大多数人完å…
¨ä¸æGNU而把整"
 "个系统当作Linux要好得多。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's developers call it &ldquo;Foobar Linux&rdquo;, but that doesn't "
 "say anything about what the system consists of.  Why shouldn't they call it "
@@ -1890,7 +1914,7 @@
 "何信息。他们为什么不能愿意叫什么就叫什么呢?<span 
class=\"anchor-reference-id"
 "\">(<a href=\"#distronames0\">#distronames0</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling a system &ldquo;Foobar Linux&rdquo; implies that it's a flavor of "
 "&ldquo;Linux,&rdquo; and people <a href=\"#distronames\">understand it that "
@@ -1899,7 +1923,7 @@
 "称系统为&ldquo;Foobar 
Linux&rdquo;暗示它是&ldquo;Linux,&rdquo;的一个分支,并"
 "且人们<a href=\"#distronames\">也是这样理解的</a>。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If they called a GNU/Linux distro &ldquo;Foobar BSD,&rdquo; you would call "
 "that a mistake.  &ldquo;This system is not BSD,&rdquo; you would tell them.  "
@@ -1908,7 +1932,7 @@
 "如果有人说一个GNU/Linux发行版&ldquo;Foobar BSD&rdquo;,你
会说这是个错误。你可"
 "能会这æ 
·å‘Šè¯‰ä»–们,&ldquo;这个系统不是BSD&rdquo;。不过,它也不是Linux。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro is called &ldquo;Foobar Linux&rdquo;; doesn't that show it's "
 "really Linux? <span class=\"anchor-reference-id\">(<a href=\"#distronames"
@@ -1917,7 +1941,7 @@
 "我的发行版叫&ldquo;Foobar 
Linux&rdquo;;难道它不就是Linux吗?<span class="
 "\"anchor-reference-id\">(<a href=\"#distronames\">#distronames</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It means that the people who make the &ldquo;Foobar Linux&rdquo; distro are "
 "repeating the common mistake. We appreciate that distributions like Debian, "
@@ -1929,7 +1953,7 @@
 
"谢Debian、Dragora、Musix、Trisquel和Venenux等发行版采纳了GNU/Linux作为它们的"
 "正式名称的一部分,而且如果你参与了å…
¶ä»–的发行版,我们鼓励你也这样做。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "My distro's official name is &ldquo;Foobar Linux&rdquo;; isn't it wrong to "
 "call the distro anything but &ldquo;Foobar Linux&rdquo;? <span class="
@@ -1939,7 +1963,7 @@
 "Linux&rdquo;不就错了吗?<span class=\"anchor-reference-id\">(<a href="
 "\"#distronames1\">#distronames1</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "When they spread misinformation by changing &ldquo;GNU&rdquo; to &ldquo;"
 "Linux&rdquo;, and call their version of it &ldquo;Foobar Linux&rdquo;, it's "
@@ -1950,7 +1974,7 @@
 "Foobar Linux&rdquo;来散布错误信息时,你
通过叫该系统为&ldquo;Foobar GNU/"
 "Linux&rdquo;而纠正错误是正确的做法。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be more effective to ask companies such as Mandrake, Red Hat and "
 "IBM to call their distributions &ldquo;GNU/Linux&rdquo; rather than asking "
@@ -1961,7 +1985,7 @@
 "Linux&rdquo;不是比普通群众更有效?<span 
class=\"anchor-reference-id\">(<a "
 "href=\"#companies\">#companies</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It isn't a choice of one or the other&mdash;we ask companies and "
 "organizations and individuals to help spread the word about this.  In fact, "
@@ -1977,7 +2001,7 @@
 
"一个纯粹的商业决定;我们希望通过叫系统为&lsquo;Linux&rsquo;而赚到更多的金钱。"
 "&rdquo;换句话说,该公司不关心什么是正确的。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We can't make them do this right, but we're not the sort to give up just "
 "because the road isn't easy.  You may not have as much influence at your "
@@ -1989,7 +2013,7 @@
 "无法和IBM或Red Hat相提并论,但是你
还是可以帮忙的。我们一起可以将事情改变到一"
 "个程度,此时称系统为&ldquo;GNU/Linux&rdquo;的å…
¬å¸ä¼šèµšåˆ°æ›´å¤šã€‚"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to reserve the name &ldquo;GNU/Linux&rdquo; for "
 "distributions that are purely free software? After all, that is the ideal of "
@@ -2000,15 +2024,26 @@
 "GNU的理想嘛。<span class=\"anchor-reference-id\">(<a href=\"#reserve"
 "\">#reserve</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+#, fuzzy
+#| msgid ""
+#| "The widespread practice of adding non-free software to the GNU/Linux "
+#| "system is a major problem for our community.  It teaches the users that "
+#| "non-free software is ok, and that using it is part of the spirit of "
+#| "&ldquo;Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part "
+#| "of their mission to help users use non-free add-ons, and may even invite "
+#| "salesmen to come and make sales pitches for them.  They adopt goals such "
+#| "as &ldquo;helping the users&rdquo; of GNU/Linux (including helping them "
+#| "use non-free applications and drivers), or making the system more popular "
+#| "even at the cost of freedom."
 msgid ""
-"The widespread practice of adding non-free software to the GNU/Linux system "
-"is a major problem for our community.  It teaches the users that non-free "
+"The widespread practice of adding nonfree software to the GNU/Linux system "
+"is a major problem for our community.  It teaches the users that nonfree "
 "software is ok, and that using it is part of the spirit of &ldquo;"
 "Linux&rdquo;.  Many &ldquo;Linux&rdquo; User Groups make it part of their "
-"mission to help users use non-free add-ons, and may even invite salesmen to "
+"mission to help users use nonfree add-ons, and may even invite salesmen to "
 "come and make sales pitches for them.  They adopt goals such as &ldquo;"
-"helping the users&rdquo; of GNU/Linux (including helping them use non-free "
+"helping the users&rdquo; of GNU/Linux (including helping them use nonfree "
 "applications and drivers), or making the system more popular even at the "
 "cost of freedom."
 msgstr ""
@@ -2019,11 +2054,11 @@
 "Linux用户&rdquo;(包
括帮助他们使用非自由的应用和驱动),甚或是以自由为代价让"
 "系统更流行。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "The question is how to try to change this."
 msgstr "问题是怎么才能改变这个情况。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Given that most of the community which uses GNU with Linux already does not "
 "realize that's what it is, for us to disown these adulterated versions, "
@@ -2035,13 +2070,22 @@
 "些掺假的版本脱离å…
³ç³»ï¼Œè¯´å®ƒä»¬ä¸æ˜¯çœŸæ­£çš„GNU,并不能更多地教育用户自由的价值。他"
 "们将不能获得应得的信息。他们首å…
ˆåªä¼šååº”出他们从来没想到该系统是GNU。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The way to lead these users to see a connection with freedom is exactly "
+#| "the opposite: to inform them that all these system versions <em>are</em> "
+#| "versions of GNU, that they all are based on a system that exists "
+#| "specifically for the sake of the users' freedom.  With this "
+#| "understanding, they can start to recognize the distributions that include "
+#| "non-free software as perverted, adulterated versions of GNU, instead of "
+#| "thinking they are proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgid ""
 "The way to lead these users to see a connection with freedom is exactly the "
 "opposite: to inform them that all these system versions <em>are</em> "
 "versions of GNU, that they all are based on a system that exists "
 "specifically for the sake of the users' freedom.  With this understanding, "
-"they can start to recognize the distributions that include non-free software "
+"they can start to recognize the distributions that include nonfree software "
 "as perverted, adulterated versions of GNU, instead of thinking they are "
 "proper and appropriate &ldquo;versions of Linux&rdquo;."
 msgstr ""
@@ -2050,7 +2094,7 @@
 "样的理解,他们就能够开始意识到包
含非自由软件的发行版是反常的、掺假的GNU版本,"
 "而不再认为它们是合理和适当的&ldquo;Linux版本&rdquo;。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is very useful to start GNU/Linux User Groups, which call the system GNU/"
 "Linux and adopt the ideals of the GNU Project as a basis for their "
@@ -2065,7 +2109,7 @@
 "其倾向(和名称)的活动,或者开展一个新的用户组。å…
³æ³¨è¡¨é¢ç›®æ ‡çš„人们有权顾及他"
 "们的观点,但是请不要让他们把你带到沟里去!"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not make a GNU distribution of Linux (sic) and call that GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</"
@@ -2074,7 +2118,7 @@
 "为什么不构造
一个Linux(sic)的GNU发行版并称之为GNU/Linux?<span class="
 "\"anchor-reference-id\">(<a href=\"#gnudist\">#gnudist</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "All the &ldquo;Linux&rdquo; distributions are actually versions of the GNU "
 "system with Linux as the kernel.  The purpose of the term &ldquo;GNU/"
@@ -2086,7 +2130,7 @@
 
"GNU/Linux&rdquo;这一名称就是来沟通这个重点。开发一个新的发行版并单独叫&ldquo;"
 "GNU/Linux&rdquo;势必会模糊我们的重点。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "As for developing a distribution of GNU/Linux, we already did this once, "
 "when we funded the early development of Debian GNU/Linux.  To do it again "
@@ -2098,7 +2142,7 @@
 
"期开发的时候。再做一次看来并不会有用;新的发行版要耗费大量工作,并且除非它比"
 "其他发行版有非常大的实际优势,它的目的不明确。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Instead we help the developers of 100% free GNU/Linux distributions, such as "
 "gNewSense and Ututo."
@@ -2106,7 +2150,7 @@
 "反之,我们会帮助100%自由的GNU/Linux发行版的开发者
,比如gNewSense和Ututo的开发"
 "者。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not just say &ldquo;Linux is the GNU kernel&rdquo; and release some "
 "existing version of GNU/Linux under the name &ldquo;GNU&rdquo;? <span class="
@@ -2116,7 +2160,7 @@
 "&ldquo;GNU&rdquo;发布? <span class=\"anchor-reference-id\">(<a href="
 "\"#linuxgnu\">#linuxgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It might have been a good idea to adopt Linux as the GNU kernel back in "
 "1992.  If we had realized, then, how long it would take to get the GNU Hurd "
@@ -2126,7 +2170,7 @@
 "GNU 
Hurd能够工作会花多长时间的话,我们也许会那么做。(呜呼,这是一个马后"
 "炮。)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we were to take an existing version of GNU/Linux and relabel it as &ldquo;"
 "GNU&rdquo;, that would be somewhat like making a version of the GNU system "
@@ -2137,7 +2181,7 @@
 "多就和使用一个GNU版本并冠以&ldquo;Linux&rdquo;之名一æ 
·ã€‚这不对,而且我们不想"
 "这么做。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Did the GNU Project condemn and oppose use of Linux in the early days? <span "
 "class=\"anchor-reference-id\">(<a href=\"#condemn\">#condemn</a>)</span>"
@@ -2145,7 +2189,7 @@
 "GNU工程早期指责和反对过使用Linux吗?<span 
class=\"anchor-reference-id\">(<a "
 "href=\"#condemn\">#condemn</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We did not adopt Linux as our kernel, but we didn't condemn or oppose it.  "
 "In 1993 we started discussing the arrangements to sponsor the development of "
@@ -2161,7 +2205,7 @@
 
"和Linux就可以直接工作了。但是这些改变经常是专门的、不可移植的;它们需要æ¸
…理才"
 "能安装。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The people who had made the changes showed little interest in cooperating "
 "with us.  One of them actually told us that he didn't care about working "
@@ -2177,7 +2221,7 @@
 "人,开发了一个基本上是基于GNU的系统,是第一个(实际
上还是仅有的一个)不愿意和"
 "我们一起工作的团体。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It was this experience that first showed us that people were calling a "
 "version of the GNU system &ldquo;Linux&rdquo;, and that this confusion was "
@@ -2190,7 +2234,7 @@
 
"Linux&rdquo;是我们对此问题的回应,也是对&ldquo;Linux&rdquo;这一误称带来的å
…¶ä»–"
 "问题的回应。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why did you wait so long before asking people to use the name GNU/Linux? "
 "<span class=\"anchor-reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
@@ -2198,7 +2242,7 @@
 "为什么你们等了这么久
才请求人们使用GNU/Linux这个名称?<span class=\"anchor-"
 "reference-id\">(<a href=\"#wait\">#wait</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Actually we didn't.  We began talking privately with developers and "
 "distributors about this in 1994, and made a more public campaign in 1996.  "
@@ -2207,7 +2251,7 @@
 "事实上,我们没有。我们在1994年就开始私下和开发者
以及贡献者谈论此事,并在1996"
 "年采取了更公开的活动。只要有必要,我们会继续下去。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should the GNU/<i>name</i> convention be applied to all programs that are "
 "GPL'ed? <span class=\"anchor-reference-id\">(<a href=\"#allgpled"
@@ -2216,7 +2260,7 @@
 "GNU/<i>name</i>这一命名规则要应用于所有的GPL程序吗?<span 
class=\"anchor-"
 "reference-id\">(<a href=\"#allgpled\">#allgpled</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We never refer to individual programs as &ldquo;GNU/<i>name</i>&rdquo;.  "
 "When a program is a GNU package, we may call it &ldquo;GNU <i>name</"
@@ -2225,7 +2269,7 @@
 
"我们从未使用&ldquo;GNU/<i>name</i>&rdquo;来指代单个的程序。当一个程序是一个"
 "GNU包时,我们也许会叫它&ldquo;GNU <i>name</i>&rdquo;。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU, the operating system, is made up of many different programs.  Some of "
 "the programs in GNU were written as part of the GNU Project or specifically "
@@ -2236,7 +2280,7 @@
 "部分或者是专门为GNU编写的;这些是GNU包
,而且我们经常在它们的名字里使用&ldquo;"
 "GNU&rdquo;一词。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It's up to the developers of a program to decide if they want to contribute "
 "it and make it a GNU package.  If you have developed a program and you would "
@@ -2248,7 +2292,7 @@
 "让它成为一个GNU包,那么请写信给<a 
href=\"mailto:gnu@gnu.org\";>&lt;gnu@gnu."
 "org&gt;</a>,这样我们就能够评估并决定是否需要它。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It wouldn't be fair to put the name GNU on every individual program that is "
 "released under the GPL.  If you write a program and release it under the "
@@ -2265,7 +2309,7 @@
 "地编写了它。如果东西不是GNU包
,GNU工程不会拿走这个荣誉,而且在其名称上添加"
 "&ldquo;GNU&rdquo;也是不合适的。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "In contrast, we do deserve the overall credit for the GNU operating system "
 "as a whole, even though not for each and every program in it.  The system "
@@ -2276,7 +2320,7 @@
 "系统之所以存在就是因
为我们的决心和锲而不舍,从1984年起,比Linux的开始早许多"
 "年。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The operating system in which Linux became popular was basically the same as "
 "the GNU operating system.  It was not entirely the same, because it had a "
@@ -2286,7 +2330,7 @@
 "Linux在å…
¶ä¸­å˜å¾—流行的操作系统基本上就是GNU操作系统。它不是完å…
¨ç›¸åŒï¼Œå› ä¸ºæœ‰ä¸"
 "同的内核,但是几乎就是一æ 
·çš„系统。它是GNU的一个变化版。它就是GNU/Linux系统。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux continues to be used primarily in derivatives of that system&mdash;in "
 "today's versions of the GNU/Linux system.  What gives these systems their "
@@ -2296,7 +2340,7 @@
 
"Linux主要还是继续在该系统的演化版中使用&mdash;在今天的GNU/Linux系统中使用。系"
 "统身份的代表是位于其中心的GNU和Linux,而不是Linux自己。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since much of GNU comes from Unix, shouldn't GNU give credit to Unix by "
 "using &ldquo;Unix&rdquo; in its name? <span class=\"anchor-reference-id\">"
@@ -2306,7 +2350,7 @@
 "部分?<span class=\"anchor-reference-id\">(<a href=\"#unix\">#unix</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Actually, none of GNU comes from Unix.  Unix was proprietary software (and "
 "still is), so using any of its code in GNU would have been illegal.  This is "
@@ -2320,7 +2364,7 @@
 "者当时的其他操作系统时,无
法获得自由,所以我们需要一个自由系统来代替它们。我们"
 "不能复制Unix程序,甚至一部分也不行;所有程序必
须重新写起。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "No code in GNU comes from Unix, but GNU is a Unix-compatible system; "
 "therefore, many of the ideas and specifications of GNU do come from Unix.  "
@@ -2332,13 +2376,22 @@
 
"来自Unix。&ldquo;GNU&rdquo;,代表&ldquo;GNU并非Unix&rdquo;,就是给予Unix致意"
 "的幽默方式,这也遵循了70年代黑客使用递归缩写的传统。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The first such recursive acronym was TINT, &ldquo;TINT Is Not "
+#| "TECO&rdquo;.  The author of TINT wrote another implementation of TECO "
+#| "(there were already many of them, for various systems), but instead of "
+#| "calling it by a dull name like &ldquo;<em>somethingorother</em> "
+#| "TECO&rdquo;, he thought of a clever amusing name.  (That's what hacking "
+#| "means: <a href=\"http://stallman.org/articles/on-hacking.html\";>playful "
+#| "cleverness</a>.)"
 msgid ""
 "The first such recursive acronym was TINT, &ldquo;TINT Is Not TECO&rdquo;.  "
 "The author of TINT wrote another implementation of TECO (there were already "
 "many of them, for various systems), but instead of calling it by a dull name "
 "like &ldquo;<em>somethingorother</em> TECO&rdquo;, he thought of a clever "
-"amusing name.  (That's what hacking means: <a href=\"http://stallman.org/";
+"amusing name.  (That's what hacking means: <a href=\"https://stallman.org/";
 "articles/on-hacking.html\">playful cleverness</a>.)"
 msgstr ""
 "第一个这样的递归缩写是TINT,表示&ldquo;TINT不是TECO(TINT Is 
Not TECO)"
@@ -2347,7 +2400,7 @@
 "有趣的名字。(这就是黑客的意义:<a 
href=\"http://stallman.org/articles/on-";
 "hacking.html\">玩得机灵</a>。)"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Other hackers enjoyed that name so much that we imitated the approach.  It "
 "became a tradition that, when you were writing from scratch a program that "
@@ -2362,7 +2415,7 @@
 
"MINK&rdquo;。本着这种精神,我们替代Unix的系统就叫做&ldquo;GNU并非"
 "Unix&rdquo;。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Historically, AT&amp;T which developed Unix did not want anyone to give it "
 "credit by using &ldquo;Unix&rdquo; in the name of a similar system, not even "
@@ -2376,7 +2429,7 @@
 "诉这样做的人。这就使每一个Unix的修改版(和Unix一æ 
·ï¼Œéƒ½æ˜¯ä¸“属软件)都有一个不"
 "带&ldquo;Unix&rdquo;的完全不同的名字,"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Should we say &ldquo;GNU/BSD&rdquo; too? <span class=\"anchor-reference-id\">"
 "(<a href=\"#bsd\">#bsd</a>)</span>"
@@ -2384,7 +2437,7 @@
 "我们也应该说&ldquo;GNU/BSD&rdquo;吗?<span 
class=\"anchor-reference-id\">(<a "
 "href=\"#bsd\">#bsd</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't call the BSD systems (FreeBSD, etc.) &ldquo;GNU/BSD&rdquo; systems, "
 "because that term does not fit the history of the BSD systems."
@@ -2392,9 +2445,15 @@
 
"我们不叫BSD系统(比如FreeBSD。)为&ldquo;GNU/BSD&rdquo;系统,因
为这样叫不符合"
 "BSD系统的历史。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The BSD system was developed by UC Berkeley as non-free software in the "
+#| "80s, and became free in the early 90s.  A free operating system that "
+#| "exists today is almost certainly either a variant of the GNU system, or a "
+#| "kind of BSD system."
 msgid ""
-"The BSD system was developed by UC Berkeley as non-free software in the 80s, "
+"The BSD system was developed by UC Berkeley as nonfree software in the 80s, "
 "and became free in the early 90s.  A free operating system that exists today "
 "is almost certainly either a variant of the GNU system, or a kind of BSD "
 "system."
@@ -2402,7 +2461,7 @@
 "BSD系统是由UC 
Berkeley在80年代开发的非自由系统,并在90年代早期成为自由软件。"
 "现今的自由操作系统几
乎可以确定不是GNU系统的变化版,就是BSD系统的一种。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "People sometimes ask whether BSD too is a variant of GNU, as GNU/Linux is.  "
 "It is not.  The BSD developers were inspired to make their code free "
@@ -2414,7 +2473,7 @@
 "者受到GNU工程的榜样激励而把代ç 
å˜æˆè‡ªç”±è½¯ä»¶ï¼Œè€Œä¸”明确受到来自GNU活动家的请"
 
"求,这些请求帮助说服他们开始走向自由软件,但是他们的代ç
 å’ŒGNU没有什么重合。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "BSD systems today use some GNU packages, just as the GNU system and its "
 "variants use some BSD programs; however, taken as wholes, they are two "
@@ -2426,7 +2485,7 @@
 "体来看,他们是两个分开发展的不同系统。BSD开发者
没有编写一个内核并添加到GNU系"
 "统中,所以GNU/BSD这样的名字不适合此情况。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The connection between GNU/Linux and GNU is much closer, and that's why the "
 "name &ldquo;GNU/Linux&rdquo; is appropriate for it."
@@ -2434,7 +2493,7 @@
 "GNU/Linux和GNU的å…
³è”要紧密得多,而且这就是为什么&ldquo;GNU/Linux&rdquo;这个名"
 "字是合适的。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is a version of GNU which uses the kernel from NetBSD.  Its developers "
 "call it &ldquo;Debian GNU/NetBSD&rdquo;, but &ldquo;GNU/"
@@ -2447,7 +2506,7 @@
 "NetBSD是整个系统,而不仅仅是内核。这不是一个BSD系统,因
为其系统的大部分和GNU/"
 "Linux系统一样。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "If I install the GNU tools on Windows, does that mean I am running a GNU/"
 "Windows system? <span class=\"anchor-reference-id\">(<a href=\"#othersys"
@@ -2456,7 +2515,7 @@
 "如果我在Windows上安装了GNUå·¥å…
·ï¼Œè¿™æ„å‘³ç€æˆ‘要说我运行了GNU/Windows系统?<span "
 "class=\"anchor-reference-id\">(<a href=\"#othersys\">#othersys</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Not in the same sense that we mean by &ldquo;GNU/Linux&rdquo;.  The tools of "
 "GNU are just a part of the GNU software, which is just a part of the GNU "
@@ -2468,7 +2527,7 @@
 "只是GNU系统的一部分,而且在它们的下层你
还有另一个完整的操作系统,该操作系统和"
 "GNU没有共同的代码。总而言之,这和GNU/Linux的情
况大不相同。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Can't Linux be used without GNU? <span class=\"anchor-reference-id\">(<a "
 "href=\"#justlinux\">#justlinux</a>)</span>"
@@ -2476,7 +2535,7 @@
 "Linux没有GNU就不能用了吗?<span class=\"anchor-reference-id\">(<a 
href="
 "\"#justlinux\">#justlinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Linux is used by itself, or with small other programs, in some appliances.  "
 "These small software systems are a far cry from the GNU/Linux system.  Users "
@@ -2488,7 +2547,7 @@
 "没法和GNU/Linux系统相提并论。比如,用户不会在电脑上安装
它们,而且会感到这些应"
 
"用令人失望。这些运行Linux的应用可以用来展示它们和GNU/Linux系统有多么的不同。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "How much of the GNU system is needed for the system to be GNU/Linux? <span "
 "class=\"anchor-reference-id\">(<a href=\"#howmuch\">#howmuch</a>)</span>"
@@ -2496,13 +2555,13 @@
 "需要多少GNU的系统才要叫做GNU/Linux系统?<span 
class=\"anchor-reference-id\">"
 "(<a href=\"#howmuch\">#howmuch</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "&ldquo;How much&rdquo; is not a meaningful question because the GNU system "
 "does not have precise boundaries."
 msgstr "&ldquo;多少&rdquo;不是一个有意义的问题,因
为GNU系统并没有准确的边界。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "GNU is an operating system maintained by a community.  It includes far more "
 "than just the GNU software packages (of which we have a specific list), and "
@@ -2516,7 +2575,7 @@
 "Linux就产生了GNU/Linux。如果你
使用了一部分GNU系统,那么说你用了&ldquo;多少"
 "&rdquo;并没有什么意义。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If we look at the level of packages, Linux is one important package in the "
 "GNU/Linux system.  The inclusion of one important GNU package is enough to "
@@ -2525,7 +2584,7 @@
 "如果我们看看包的级别,Linux是GNU/Linux系统的一个重要的包
。包含一个重要的GNU包"
 "已经足够我们要求在名称上平等对待了。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Are there complete Linux systems [sic] without GNU? <span class=\"anchor-"
 "reference-id\">(<a href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</"
@@ -2534,7 +2593,7 @@
 "有没有不带GNU的完整的Linux系统[sic]?<span 
class=\"anchor-reference-id\">(<a "
 "href=\"#linuxsyswithoutgnu\">#linuxsyswithoutgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "There are complete systems that contain Linux and not GNU; Android is an "
 "example.  But it is a mistake to call them &ldquo;Linux&rdquo; systems, just "
@@ -2543,7 +2602,7 @@
 
"有一些完整的系统带有Linux而没有GNU,Android就是一个例子。但是叫它们&ldquo;"
 
"Linux&rdquo;系统是一个错误,正如叫GNU为&ldquo;Linux&rdquo;系统是个错误一æ
 ·ã€‚"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android is very different from the GNU/Linux system&mdash;because the two "
 "have very little code in common.  In fact, the only thing they have in "
@@ -2552,7 +2611,7 @@
 "Android和GNU/Linux系统非常不同&mdash;因为它们两个共同的代ç 
å¾ˆå°‘。事实上,它们"
 "唯一的共同点就是Linux。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you call the whole GNU/Linux system &ldquo;Linux&rdquo;, you will find it "
 "necessary to say things like, &ldquo;Android contains Linux, but it isn't "
@@ -2563,7 +2622,7 @@
 "的叫法使你犯难,比如&ldquo;Android包
含Linux,但它不是Linux,因为它没有你所说"
 "的Linux [sic]常常带有的库和应用[就是GNU系统]。&rdquo;"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Android contains just as much of Linux as GNU/Linux does.  What it doesn't "
 "have is the GNU system.  Android replaces that with Google software that "
@@ -2573,7 +2632,7 @@
 "Android和GNU/Linux带有的Linux一æ 
·å¤šã€‚它没有的是GNU系统。Android把GNU用Google"
 "软件代替,å…
¶å·¥ä½œæ–¹å¼ä¹Ÿå¤§æœ‰ä¸åŒã€‚使Android和GNU/Linux不同的原因
正是GNU的缺失。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Is it correct to say &ldquo;using Linux&rdquo; if it refers to using GNU/"
 "Linux and using Android? <span class=\"anchor-reference-id\">(<a href="
@@ -2585,13 +2644,13 @@
 "\"#usegnulinuxandandroidlinuxsyswithoutgnu"
 "\">#usegnulinuxandandroidlinuxsyswithoutgnu</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Far from it.  That usage is so strained that people will not understand the "
 "intended meaning."
 msgstr "完全不对。这种用法太牵强,人们是无法知道å…
¶ç¡®åˆ‡çš„意思的。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public will find it very strange to speak of using Android as &ldquo;"
 "using Linux&rdquo;.  It's like having a conversation, then saying you were "
@@ -2600,7 +2659,7 @@
 "å…
¬ä¼—会觉得用&ldquo;使用Linux&rdquo;来说使用Android非常奇怪。就像ä½
 åœ¨å’Œåˆ«äººè°ˆ"
 "话,但是你说你是在和内脏或循环系统谈话一样。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "The public <em>will</em> understand the idea of &ldquo;using Linux&rdquo; "
 "when it's really GNU/Linux, by way of the usual misunderstanding: thinking "
@@ -2609,7 +2668,7 @@
 "å…
¬ä¼—<em>会</em>把事实上的使用GNU/Linux理解为&ldquo;使用Linux&rdquo;,这就是常"
 "见的误解:认为整个系统就是&ldquo;Linux&rdquo;。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Use of Android and use of GNU/Linux are totally different, as different as "
 "driving a car and riding a bicycle.  The fact that the first two both "
@@ -2627,7 +2686,7 @@
 "在和读者开玩笑。你
会说,&ldquo;使用汽车和自行车&rdquo;。同样的,谈论使用GNU/"
 
"Linux和Android的明确方法是说&ldquo;使用GNU/Linux和Android&rdquo;。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not call the system &ldquo;Linux&rdquo; anyway, and strengthen Linus "
 "Torvalds' role as posterboy for our community? <span class=\"anchor-"
@@ -2637,7 +2696,7 @@
 "的广告人物?<span class=\"anchor-reference-id\">(<a href=\"#helplinus"
 "\">#helplinus</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Linus Torvalds is the &ldquo;posterboy&rdquo; (other people's choice of "
 "word, not ours) for his goals, not ours.  His goal is to make the system "
@@ -2653,12 +2712,22 @@
 
"philosophy/why-free.html\">自由合作</a>作为一个道德原则,这就是å
…¬ä¼—没有把"
 "&ldquo;Linux&rdquo;这一名称和该道德原则连接到一起的原因。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Linus publicly states his disagreement with the free software movement's "
+#| "ideals.  He developed non-free software in his job for many years (and "
+#| "said so to a large audience at a &ldquo;Linux&rdquo;World show), and "
+#| "publicly invited fellow developers of Linux, the kernel, to use non-free "
+#| "software to work on it with him.  He goes even further, and rebukes "
+#| "people who suggest that engineers and scientists should consider social "
+#| "consequences of our technical work&mdash;rejecting the lessons society "
+#| "learned from the development of the atom bomb."
 msgid ""
 "Linus publicly states his disagreement with the free software movement's "
-"ideals.  He developed non-free software in his job for many years (and said "
+"ideals.  He developed nonfree software in his job for many years (and said "
 "so to a large audience at a &ldquo;Linux&rdquo;World show), and publicly "
-"invited fellow developers of Linux, the kernel, to use non-free software to "
+"invited fellow developers of Linux, the kernel, to use nonfree software to "
 "work on it with him.  He goes even further, and rebukes people who suggest "
 "that engineers and scientists should consider social consequences of our "
 "technical work&mdash;rejecting the lessons society learned from the "
@@ -2669,7 +2738,7 @@
 "者
和他一起使用非自由软件来工作。他甚至走得更远,他指责那些建议工程师和科学家"
 "应该考虑技术进步对社会影响的人们&mdash;拒绝学习
原子弹的开发对社会的教训。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There is nothing wrong with writing a free program for the motivations of "
 "learning and having fun; the kernel Linus wrote for those reasons was an "
@@ -2685,7 +2754,7 @@
 "们也不能保证我们将来的自由。å…
¬ä¼—应该知道这个道理。Linus有权利推动其观点;不"
 
"过,人们应该知晓我们讨论的操作系统源自自由的理念,而不是他的观点。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong for us to label Linus Torvalds' work as GNU? <span class="
 "\"anchor-reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
@@ -2693,7 +2762,7 @@
 "难道我们把Linus Torvalds的成果标记为GNU不是错误吗?<span 
class=\"anchor-"
 "reference-id\">(<a href=\"#claimlinux\">#claimlinux</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong, so we don't do that.  Torvalds' work is Linux, the "
 "kernel; we are careful not to attribute that work to the GNU Project or "
@@ -2704,7 +2773,7 @@
 
"并没有把它作为GNU工程的贡献,也没有把它贴上&ldquo;GNU&rdquo;的æ
 ‡ç­¾ã€‚当我们谈"
 
"论整个系统时,我们使用&ldquo;GNU/Linux&rdquo;的名字来给予他应得的荣誉。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Does Linus Torvalds agree that Linux is just the kernel? <span class="
 "\"anchor-reference-id\">(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
@@ -2712,10 +2781,17 @@
 "Linus Torvalds同意Linux只是内核的说法吗?<span 
class=\"anchor-reference-id\">"
 "(<a href=\"#linusagreed\">#linusagreed</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "He recognized this at the beginning.  The earliest Linux release notes "
+#| "said, <a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-";
+#| "versions/RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are "
+#| "GNU software and are under the GNU copyleft. These tools aren't in the "
+#| "distribution - ask me (or GNU)  for more info&rdquo;</a>."
 msgid ""
 "He recognized this at the beginning.  The earliest Linux release notes said, "
-"<a href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
+"<a href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/";
 "RELNOTES-0.01\"> &ldquo;Most of the tools used with linux are GNU software "
 "and are under the GNU copyleft. These tools aren't in the distribution - ask "
 "me (or GNU)  for more info&rdquo;</a>."
@@ -2725,7 +2801,7 @@
 "一起使用的工具是GNU软件,是使用GNU 
copyleft发布的。这些工具不在此发布之列——请"
 "向我(或者是GNU)咨询详情&rdquo;</a>。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not finish the GNU Hurd kernel, release the GNU system as a whole, and "
 "forget the question of what to call GNU/Linux? <span class=\"anchor-"
@@ -2735,26 +2811,33 @@
 "class=\"anchor-reference-id\">(<a href=\"#finishhurd\">#finishhurd</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We would like credit for the GNU operating system no matter which kernel is "
 "used with it."
 msgstr "无论使用哪个内æ 
¸ï¼Œæˆ‘们都希望GNU操作系统获得荣誉。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "Making the GNU Hurd work well enough to compete with Linux would be a big "
+#| "job, and it's not clearly necessary.  The only thing ethically wrong with "
+#| "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the "
+#| "best fix for that problem is <a href=\"http://fsf.org/campaigns/priority-";
+#| "projects\"> developing free replacement for the blobs</a>."
 msgid ""
 "Making the GNU Hurd work well enough to compete with Linux would be a big "
 "job, and it's not clearly necessary.  The only thing ethically wrong with "
 "Linux as a kernel is its inclusion of firmware &ldquo;blobs&rdquo;; the best "
-"fix for that problem is <a href=\"http://fsf.org/campaigns/priority-projects";
-"\"> developing free replacement for the blobs</a>."
+"fix for that problem is <a href=\"https://www.fsf.org/campaigns/priority-";
+"projects\"> developing free replacement for the blobs</a>."
 msgstr ""
 "要使GNU 
Hurd能够和Linux竞争是一个艰巨的工作,而且并没有明确的必
要。Linux作为"
 "内核唯一的道德错误是它带有固件&ldquo;blobs&rdquo;;对å…
¶æœ€å¥½çš„解决方案是<a "
 
"href=\"http://fsf.org/campaigns/priority-projects\";>开发这些blobs的自由替代软"
 "件</a>。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "The battle is already lost&mdash;society has made its decision and we can't "
 "change it, so why even think about it? <span class=\"anchor-reference-id\">"
@@ -2763,7 +2846,7 @@
 "战斗已经失败了&mdash;社区已经做出了选择而我们无
法更改,为什么还纠结这事儿?"
 "<span class=\"anchor-reference-id\">(<a href=\"#lost\">#lost</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This isn't a battle, it is a campaign of education.  What to call the system "
 "is not a single decision, to be made at one moment by &ldquo;society&rdquo;: "
@@ -2777,7 +2860,7 @@
 "他人说&ldquo;GNU/Linux&rdquo;,但是你
能够决定自己叫该系统为&ldquo;GNU/"
 "Linux&rdquo;&mdash;你这样做,你就是在教育其他人。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Society has made its decision and we can't change it, so what good does it "
 "do if I say &ldquo;GNU/Linux&rdquo;? <span class=\"anchor-reference-id\">(<a "
@@ -2787,7 +2870,7 @@
 "呢?<span class=\"anchor-reference-id\">(<a 
href=\"#whatgood\">#whatgood</a>)"
 "</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "This is not an all-or-nothing situation: correct and incorrect pictures are "
 "being spread more or less by various people.  If you call the system &ldquo;"
@@ -2804,7 +2887,7 @@
 "哪怕仅有几百个人看到你在使用&ldquo;GNU/Linux&rdquo;,你
也已经不费吹灰之力地教"
 "育了相当数目的人了。而且å…
¶ä¸­ä¼šæœ‰ä¸€äº›äººç»§ç»­å‘另外的人传播正确的概念。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't it be better to call the system &ldquo;Linux&rdquo; and teach "
 "people its real origin with a ten-minute explanation? <span class=\"anchor-"
@@ -2813,7 +2896,7 @@
 "把系统叫做&ldquo;Linux&rdquo;再花10分钟教育人们å…
¶æ¥é¾™åŽ»è„‰ä¸æ˜¯æ›´å¥½å—?<span "
 "class=\"anchor-reference-id\">(<a href=\"#explain\">#explain</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "If you help us by explaining to others in that way, we appreciate your "
 "effort, but that is not the best method.  It is not as effective as calling "
@@ -2822,7 +2905,7 @@
 "如果你帮助我们这样向他人解释,我们感谢你
的努力,但是这并不是最好的方式。它不"
 
"如直接叫系统为&ldquo;GNU/Linux&rdquo;有效,也没有有效地利用ä½
 çš„时间。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is ineffective because it may not sink in, and surely will not "
 "propagate.  Some of the people who hear your explanation will pay attention, "
@@ -2836,7 +2919,7 @@
 "复这æ 
·çš„解释。他们可能只会称该系统为&ldquo;Linux&rdquo;。不经意之间,他们会帮"
 "助扩散错误的画面。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It is inefficient because it takes a lot more time.  Saying and writing "
 "&ldquo;GNU/Linux&rdquo; will take you only a few seconds a day, not minutes, "
@@ -2848,7 +2931,7 @@
 "需花几秒钟,所以你
能够告诉非常多的人。在书面和口头区别Linux和GNU/Linux是目前"
 "帮助GNU工程的最有效的方法。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people laugh at you when you ask them to call the system GNU/Linux.  "
 "Why do you subject yourself to this treatment? <span class=\"anchor-"
@@ -2858,7 +2941,7 @@
 "<span class=\"anchor-reference-id\">(<a href=\"#treatment\">#treatment</a>)</"
 "span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Calling the system &ldquo;Linux&rdquo; tends to give people a mistaken "
 "picture of the system's history and reason for existence.  People who laugh "
@@ -2870,7 +2953,7 @@
 
"嘲笑我们的请求的人可能已经看了错误的画面&mdash;他们以为Linus做了这一切,所以"
 
"他们在我们请求荣誉时嘲笑我们。如果他们了解了事实,可能他们就不会笑了。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Why do we take the risk of making a request that sometimes leads people to "
 "ridicule us? Because often it has useful results that help the GNU Project.  "
@@ -2879,7 +2962,7 @@
 "我们为什么要冒被嘲弄的风险来发出我们的请求呢?因
为通常这样做对GNU工程是有帮助"
 "的。我们要冒着受不该受的侮辱的风险实现我们的目标。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "If you see such an ironically unfair situation occurring, please don't sit "
 "idly by.  Please teach the laughing people the real history.  When they see "
@@ -2888,7 +2971,7 @@
 "如果你看到如此可笑的不å…
¬å¹³äº‹ä»¶ï¼Œè¯·ä¸è¦åè§†ä¸ç®¡ã€‚请教育那些在嘲笑的人历史的真"
 
"相。当他们看到我们的请求是合理的时候,任何有正义感的人都不会再笑了。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Some people condemn you when you ask them to call the system GNU/Linux.  "
 "Don't you lose by alienating them? <span class=\"anchor-reference-id\">(<a "
@@ -2897,7 +2980,7 @@
 "当你让他们叫该系统为GNU/Linux时,人们会指责你
。疏远他们,不也是损失?<span "
 "class=\"anchor-reference-id\">(<a href=\"#alienate\">#alienate</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "Not much.  People who don't appreciate our role in developing the system are "
 "unlikely to make substantial efforts to help us.  If they do work that "
@@ -2911,7 +2994,7 @@
 "为我们的请求。同时,他们在教育å…
¶ä»–人把我们的贡献赋予另外的人,这实际上消弱了"
 "我们获得帮助的能力。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It makes no sense to worry about alienating people who are already mostly "
 "uncooperative, and it is self-defeating to be deterred from correcting a "
@@ -2921,7 +3004,7 @@
 "担心疏远那些本来就不那么合作的人毫无意义,为了避å…
æ¿€æ€’那些始作俑者而规避主要"
 "矛盾会带来更大的伤害。所以我们会继续纠
正这个名称误用。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Whatever you contributed, is it legitimate to rename the operating system? "
 "<span class=\"anchor-reference-id\">(<a href=\"#rename\">#rename</a>)</span>"
@@ -2929,7 +3012,7 @@
 "无论你做了什么贡献,你有权重命名系统吗?<span 
class=\"anchor-reference-id\">"
 "(<a href=\"#rename\">#rename</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We are not renaming anything; we have been calling this system &ldquo;"
 "GNU&rdquo; ever since we announced it in 1983.  The people who tried to "
@@ -2938,7 +3021,7 @@
 
"我们不是在命名所有的东西;我们自从1983年声明以来,就一直叫该系统为&ldquo;"
 
"GNU&rdquo;。那些将系统改称为&ldquo;Linux&rdquo;的人本不该那么做。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it wrong to force people to call the system &ldquo;GNU/Linux&rdquo;? "
 "<span class=\"anchor-reference-id\">(<a href=\"#force\">#force</a>)</span>"
@@ -2946,7 +3029,7 @@
 "强制人们叫它&ldquo;GNU/Linux&rdquo;系统不是错误吗?<span 
class=\"anchor-"
 "reference-id\">(<a href=\"#force\">#force</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "It would be wrong to force them, and we don't try.  We call the system "
 "&ldquo;GNU/Linux&rdquo;, and we ask you to do it too."
@@ -2954,7 +3037,7 @@
 "如果我们是强制,那么我们错了;我们没有那æ 
·ã€‚我们称该系统为&ldquo;GNU/"
 "Linux&rdquo;,并且我们也请求你这么做。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Why not sue people who call the whole system &ldquo;Linux&rdquo;? <span "
 "class=\"anchor-reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
@@ -2962,7 +3045,7 @@
 "为什么不控告哪些叫整个系统为&ldquo;Linux&rdquo;的人?<span 
class=\"anchor-"
 "reference-id\">(<a href=\"#whynotsue\">#whynotsue</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "There are no legal grounds to sue them, but since we believe in freedom of "
 "speech, we wouldn't want to do that anyway.  We ask people to call the "
@@ -2971,7 +3054,7 @@
 
"控告没有法律基础,由于我们坚信言论自由,即使有理我们也不会诉之法律。我们请求"
 "人们称系统为&ldquo;GNU/Linux&rdquo;是因为这是在做正确的事。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Shouldn't you put something in the GNU GPL to require people to call the "
 "system &ldquo;GNU&rdquo;? <span class=\"anchor-reference-id\">(<a href="
@@ -2980,13 +3063,23 @@
 "难道不能在GNU 
GPL中要求人们称该系统为&ldquo;GNU&rdquo;吗?<span class="
 "\"anchor-reference-id\">(<a href=\"#require\">#require</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
+#, fuzzy
+#| msgid ""
+#| "The purpose of the GNU GPL is to protect the users' freedom from those "
+#| "who would make proprietary versions of free software.  While it is true "
+#| "that those who call the system &ldquo;Linux&rdquo; often do things that "
+#| "limit the users' freedom, such as bundling non-free software with the GNU/"
+#| "Linux system or even developing non-free software for such use, the mere "
+#| "act of calling the system &ldquo;Linux&rdquo; does not, in itself, deny "
+#| "users their freedom.  It seems improper to make the GPL restrict what "
+#| "name people can use for the system."
 msgid ""
 "The purpose of the GNU GPL is to protect the users' freedom from those who "
 "would make proprietary versions of free software.  While it is true that "
 "those who call the system &ldquo;Linux&rdquo; often do things that limit the "
-"users' freedom, such as bundling non-free software with the GNU/Linux system "
-"or even developing non-free software for such use, the mere act of calling "
+"users' freedom, such as bundling nonfree software with the GNU/Linux system "
+"or even developing nonfree software for such use, the mere act of calling "
 "the system &ldquo;Linux&rdquo; does not, in itself, deny users their "
 "freedom.  It seems improper to make the GPL restrict what name people can "
 "use for the system."
@@ -2996,7 +3089,7 @@
 "加入非自由软件,甚至是为此开发非自由软件,仅仅
是称系统为&ldquo;Linux&rdquo;本"
 
"身并不剥夺用户的自由。让GPL限制人们对所用系统的名称并不合适。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you objected to the original BSD license's advertising requirement to "
 "give credit to the University of California, isn't it hypocritical to demand "
@@ -3007,7 +3100,7 @@
 "GNU工程不是虚伪吗?<span class=\"anchor-reference-id\">(<a 
href=\"#BSDlicense"
 "\">#BSDlicense</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "It would be hypocritical to make the name GNU/Linux a license requirement, "
 "and we don't.  We only <em>ask</em> you to give us the credit we deserve."
@@ -3015,7 +3108,7 @@
 
"把GNU/Linux这一名称作为许可证要求也许是虚伪,而且我们没有那æ
 ·åšã€‚我们只是<em>"
 "请求</em>你给予我们应得的荣誉。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Please note that there are at least <a href=\"/licenses/bsd.html\"> two "
 "different BSD licenses</a>.  For clarity's sake, please don't use the term "
@@ -3024,7 +3117,7 @@
 "请注意至少有<a 
href=\"/licenses/bsd.html\">两种不同的BSD许可证</a>。为了清晰"
 
"起见,请不要在没有明确是哪一个许可证时使用&ldquo;BSD许可证&rdquo;一词。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since you failed to put something in the GNU GPL to require people to call "
 "the system &ldquo;GNU&rdquo;, you deserve what happened; why are you "
@@ -3035,7 +3128,7 @@
 "生;为什么你现在又抱怨呢?<span 
class=\"anchor-reference-id\">(<a href="
 "\"#deserve\">#deserve</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "The question presupposes a rather controversial general ethical premise: "
 "that if people do not force you to treat them fairly, you are entitled to "
@@ -3045,11 +3138,11 @@
 
"此问题假定了一个相当矛盾的一般道德前提:如果人们没有强迫ä½
 å…¬å¹³å¯¹å¾…他们,那么"
 "你就有权任意利用他们。换句话说,该问题认为这æ 
·çš„假定是对的。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope you disagree with that premise just as we do."
 msgstr "希望你和我们一样不同意该假定。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Wouldn't you be better off not contradicting what so many people believe? "
 "<span class=\"anchor-reference-id\">(<a href=\"#contradict\">#contradict</a>)"
@@ -3058,7 +3151,7 @@
 "如果你们不和这么多人作对,情况不是更好吗?<span 
class=\"anchor-reference-id"
 "\">(<a href=\"#contradict\">#contradict</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
 msgid ""
 "We don't think we should go along with large numbers of people because they "
 "have been misled.  We hope you too will decide that truth is important."
@@ -3066,7 +3159,7 @@
 
"我们不认为我们应该由于数目大的人群被误导而跟随他们。我们也希望ä½
 çš„决定是因为"
 "事实更重要。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "We could never have developed a free operating system without first denying "
 "the belief, held by most people, that proprietary software was legitimate "
@@ -3075,7 +3168,7 @@
 "如果我们没有首å…
ˆæŒ‘战大多数人的信仰:专属软件是合理和可接受的,那么我们可能就"
 "永远不能开发出一个自由的操作系统。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Since many people call it &ldquo;Linux&rdquo;, doesn't that make it right? "
 "<span class=\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</"
@@ -3084,11 +3177,11 @@
 
"由于许多人都叫它&ldquo;Linux&rdquo;,不正说明这是正确的?<span
 class="
 "\"anchor-reference-id\">(<a href=\"#somanyright\">#somanyright</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid "We don't think that the popularity of an error makes it the truth."
 msgstr "我们认为将一个流行的错误当成事实是不对的。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Isn't it better to call the system by the name most users already know? "
 "<span class=\"anchor-reference-id\">(<a href=\"#knownname\">#knownname</a>)</"
@@ -3097,7 +3190,7 @@
 "把系统名称按ç…
§å¤§å¤šæ•°ç”¨æˆ·å·²çŸ¥çš„名称来叫不是更好吗?<span class=\"anchor-"
 "reference-id\">(<a href=\"#knownname\">#knownname</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd><p>
 msgid ""
 "Users are not incapable of learning.  Since &ldquo;GNU/Linux&rdquo; includes "
 "&ldquo;Linux&rdquo;, they will recognize what you're talking about.  If you "
@@ -3108,7 +3201,7 @@
 "会了解你指的是什么。如果你时不时地加
上&ldquo;(经常错误地被认为是&lsquo;"
 "Linux&rsquo;)&rdquo;,他们就全都明白了。"
 
-#. type: Content of: <div><div><dl><dt>
+#. type: Content of: <div><dl><dt>
 msgid ""
 "Many people care about what's convenient or who's winning, not about "
 "arguments of right or wrong.  Couldn't you get more of their support by a "
@@ -3119,18 +3212,25 @@
 "多的支持吗?<span class=\"anchor-reference-id\">(<a href=\"#winning"
 "\">#winning</a>)</span>"
 
-#. type: Content of: <div><div><dl><dd>
+#. type: Content of: <div><dl><dd>
+#, fuzzy
+#| msgid ""
+#| "To care only about what's convenient or who's winning is an amoral "
+#| "approach to life.  Non-free software is an example of that amoral "
+#| "approach and thrives on it.  Thus, in the long run it would be self-"
+#| "defeating for us to adopt that approach.  We will continue talking in "
+#| "terms of right and wrong."
 msgid ""
 "To care only about what's convenient or who's winning is an amoral approach "
-"to life.  Non-free software is an example of that amoral approach and "
-"thrives on it.  Thus, in the long run it would be self-defeating for us to "
-"adopt that approach.  We will continue talking in terms of right and wrong."
+"to life.  Nonfree software is an example of that amoral approach and thrives "
+"on it.  Thus, in the long run it would be self-defeating for us to adopt "
+"that approach.  We will continue talking in terms of right and wrong."
 msgstr ""
 
"只在乎哪里方便或谁个获胜是一个非道德的生活方式。非自由软件就是这种非道德方式"
 "的例子,而且因
之繁荣。所以,长期来看,我们接受该方式就是搬起石头ç 
¸è‡ªå·±çš„脚。"
 "我们要继续在正确和错误的框架下讨论问题。"
 
-#. type: Content of: <div><div><dl><dd><p>
+#. type: Content of: <div><dl><dd><p>
 msgid "We hope that you are one of those for whom right and wrong do matter."
 msgstr "我们希望你是看重谁是谁非的一员。"
 
@@ -3179,12 +3279,16 @@
 "解有关协调和提交文章翻译的信息。"
 
 #. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+#| "Foundation, Inc."
 msgid ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2001-2011, 2013-2018, 2020, 2021 Free Software Foundation, "
+"Inc."
 msgstr ""
-"Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
-"Free Software Foundation, Inc."
+"Copyright &copy; 2014, 2015, 2016, 2017, 2018, 2019 Free Software "
+"Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -3210,6 +3314,13 @@
 msgid "Updated:"
 msgstr "最后更新:"
 
+#~ msgid ""
+#~ "Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
+#~ "Free Software Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2001, 2006-2008, 2010, 2011, 2013, 2014-2018, 2020, 2021 "
+#~ "Free Software Foundation, Inc."
+
 #~ msgid "GNU/Linux FAQ by Richard Stallman"
 #~ msgstr "Richard Stallman之GNU/Linux问答"
 

Index: gnu/po/gnu-users-never-heard-of-gnu.ar-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.ar-diff.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gnu/po/gnu-users-never-heard-of-gnu.ar-diff.html    30 May 2021 18:01:56 
-0000      1.10
+++ gnu/po/gnu-users-never-heard-of-gnu.ar-diff.html    30 Aug 2021 13:34:53 
-0000      1.11
@@ -10,41 +10,36 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;GNU Users Who Have Never Heard of GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/gnu/po/gnu-users-never-heard-of-gnu.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;GNU</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;GNU</em></ins></span> 
Users Who Have Never Heard <span class="removed"><del><strong>of GNU&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;GNU Users Who Have Never Heard <span class="removed"><del><strong>of 
GNU&lt;/h2&gt;
 
-&lt;p&gt;&lt;strong&gt;by</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU&lt;/h2&gt;
+&lt;p&gt;&lt;strong&gt;by &lt;a href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
-&lt;address class="byline c"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
-<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;
-
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;To</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;To</em></ins></span> learn more about 
this issue, you can also read
+  &lt;blockquote&gt;&lt;p&gt;To learn more about this issue, you can also read
 our &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;, our page 
on 
 &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt; 
-and our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
Project&lt;/a&gt;.
-<span 
class="removed"><del><strong>&lt;/p&gt;&lt;/blockquote&gt;</strong></del></span>
-<span class="inserted"><ins><em>&lt;/p&gt;</em></ins></span>
-&lt;/div&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;
+and our page on</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU&lt;/h2&gt;
+
+&lt;address class="byline"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="/gnu/linux-and-gnu.html"&gt;Linux and the 
GNU Project&lt;/a&gt;.
+&lt;/p&gt;&lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;Most people have never heard of GNU.  Even most of the people who
 use the GNU system have never heard of GNU, <span 
class="removed"><del><strong>thanks to</strong></del></span> <span 
class="inserted"><ins><em>since</em></ins></span> so many people and
-companies <span class="removed"><del><strong>who</strong></del></span> teach 
them to call it &ldquo;Linux&rdquo;.  <span 
class="removed"><del><strong>Nonetheless,
-the name</strong></del></span>  <span 
class="inserted"><ins><em>Indeed,</em></ins></span> GNU <span 
class="removed"><del><strong>has certain associations, which people will 
discover once</strong></del></span>
-<span class="inserted"><ins><em>users often say</em></ins></span> they <span 
class="removed"><del><strong>hear the name.  GNU</strong></del></span> <span 
class="inserted"><ins><em>are &ldquo;running Linux&rdquo;, 
which</em></ins></span> is <span 
class="removed"><del><strong>associated</strong></del></span> <span 
class="inserted"><ins><em>like
+companies <span class="removed"><del><strong>who</strong></del></span> teach 
them to call it <span class="removed"><del><strong>&ldquo;Linux&rdquo;.  
Nonetheless,
+the name</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;  Indeed,</em></ins></span> GNU 
<span class="removed"><del><strong>has certain associations, which people will 
discover once</strong></del></span>
+<span class="inserted"><ins><em>users often say</em></ins></span> they <span 
class="removed"><del><strong>hear the name.  GNU</strong></del></span> <span 
class="inserted"><ins><em>are &ldquo;running Linux,&rdquo; 
which</em></ins></span> is <span 
class="removed"><del><strong>associated</strong></del></span> <span 
class="inserted"><ins><em>like
 saying you are &ldquo;driving your carburetor&rdquo; or
-&ldquo;driving your transmission&rdquo;.&lt;/p&gt;
+&ldquo;driving your transmission.&rdquo;&lt;/p&gt;
 
 &lt;p&gt;Nonetheless, those who know about GNU associate it</em></ins></span> 
with the ideals
 of freedom of the free software movement.  That association is no
@@ -64,9 +59,9 @@
 href="http://www.gnu.org"&gt;www.gnu.org&lt;/a&gt;, which talks about free
 software and freedom.&lt;/p&gt;
 
-&lt;p&gt;A person seeing the name &ldquo;GNU&rdquo; for</strong></del></span> 
the <span class="removed"><del><strong>first time in
+&lt;p&gt;A person seeing the name &ldquo;GNU&rdquo; for the first time in
 &ldquo;GNU/Linux&rdquo; won't immediately associate it with anything.
-However, when people know that the system is basically GNU, that brings
+However, when people know that</strong></del></span> the <span 
class="removed"><del><strong>system is basically GNU, that brings
 them a step closer to learning about our ideals.  For instance, they
 might become curious and look for more information about 
GNU.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>ideas GNU 
stands for.&lt;/p&gt;</em></ins></span>
 
@@ -86,10 +81,19 @@
 system.  It is also useful as a reminder for people in our community
 who know about these ideals, in a world where much of discussion of
 free software takes a totally practical (and thus amoral) approach.
-When we ask you to call the system &ldquo;GNU/Linux&rdquo;, we <span 
class="removed"><del><strong>do so because
+When we ask you to call the system <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> we 
<span class="removed"><del><strong>do so because
 awareness of GNU slowly but surely brings with it 
awareness</strong></del></span> <span class="inserted"><ins><em>are
-asking you to help in making the public aware</em></ins></span> of the free 
software <span class="removed"><del><strong>ideals of freedom and 
community.&lt;/p&gt;</strong></del></span>
+asking you to help in making the public aware</em></ins></span> of the free 
software <span class="removed"><del><strong>ideals of 
freedom</strong></del></span>
 <span class="inserted"><ins><em>ideals.&lt;/p&gt;
+
+&lt;div class="announcement comment" role="complementary"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;p&gt;To learn more about this issue, you can also read
+our &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;, our page 
on 
+&lt;a href="/gnu/why-gnu-linux.html"&gt;Why 
GNU/Linux?&lt;/a&gt;</em></ins></span> 
+and <span 
class="removed"><del><strong>community.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>our page on &lt;a 
href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU System&lt;/a&gt;.
+&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
 &lt;/div&gt;
 &lt;/div&gt;</em></ins></span>
 
@@ -140,7 +144,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2006, 2007, <span class="removed"><del><strong>2013, 
2014</strong></del></span> <span class="inserted"><ins><em>2013-2015, 2017, 
2019, 2021</em></ins></span> Free Software
+&lt;p&gt;Copyright &copy; 2006, <span class="removed"><del><strong>2007, 2013, 
2014</strong></del></span> <span class="inserted"><ins><em>2015, 
2021</em></ins></span> Free Software
 Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
@@ -152,11 +156,12 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/30 18:01:56 $
+$Date: 2021/08/30 13:34:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-&lt;/div&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for class="inner", starts 
in the banner include --&gt;</em></ins></span>
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>

Index: gnu/po/gnu-users-never-heard-of-gnu.ar.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.ar.po,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- gnu/po/gnu-users-never-heard-of-gnu.ar.po   30 May 2021 17:01:39 -0000      
1.38
+++ gnu/po/gnu-users-never-heard-of-gnu.ar.po   30 Aug 2021 13:34:53 -0000      
1.39
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2009-09-02 23:02+0200\n"
 "Last-Translator: Hossam Hossny <hossam@gnu.org>\n"
 "Language-Team: Arabic\n"
@@ -30,33 +30,21 @@
 msgstr ""
 "مستخدمو غنو الذين لم يسمعوا عنه أبدًا - م
شروع غنو - مؤسسة البرمجيات الحرة"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU Users Who Have Never Heard of&nbsp;GNU"
 msgstr "مستخدمو غنو الذين لم يسمعوا 
عنه&nbsp;أبدًا"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "بقلم <a href=\"https://www.stallman.org/\";>ريتشارد 
ستولمن</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
-"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>."
-msgstr ""
-"لتعلم المزيد حول هذه القضية، تستطيع أيضا 
قراءة<a href=\"/gnu/gnu-linux-faq."
-"html\">أسئلة غنو/لينكس الشائعة</a>، وصفحتنا 
حول <a href=\"/gnu/why-gnu-linux."
-"html\">لماذا غنو/لينكس؟</a>، وصفحتنا عن <a 
href=\"/gnu/linux-and-gnu.html"
-"\">لينكس ومشروع غنو</a>."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Most people have never heard of GNU.  Even most of the people who use the
 # | GNU system have never heard of GNU, [-thanks to-] {+since+} so many people
-# | and companies [-who-] teach them to call it &ldquo;Linux&rdquo;. 
-# | {+Indeed, GNU users often say they are &ldquo;running Linux&rdquo;, which
-# | is like saying you are &ldquo;driving your carburetor&rdquo; or
-# | &ldquo;driving your transmission&rdquo;.+}
+# | and companies [-who-] teach them to call it [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo; Indeed, GNU users often say they are &ldquo;running
+# | Linux,&rdquo; which is like saying you are &ldquo;driving your
+# | carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;+}
 #, fuzzy
 #| msgid ""
 #| "Most people have never heard of GNU.  Even most of the people who use the "
@@ -65,15 +53,15 @@
 msgid ""
 "Most people have never heard of GNU.  Even most of the people who use the "
 "GNU system have never heard of GNU, since so many people and companies teach "
-"them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say they are "
-"&ldquo;running Linux&rdquo;, which is like saying you are &ldquo;driving "
-"your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
+"them to call it &ldquo;Linux.&rdquo; Indeed, GNU users often say they are "
+"&ldquo;running Linux,&rdquo; which is like saying you are &ldquo;driving "
+"your carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;"
 msgstr ""
 "لم يسمع أكثر الناس أبدًا عن غنو. بل حتى أن م
عظم الناس الذي يستخدمون نظام غنو "
 "لم يسمعوا عن غنو، الشكر للأشخاص الكثر 
وللشركات التي علمتهم تسميته &rdquo;"
 "لينكس&ldquo;."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Nonetheless, [-the name-] {+those who know about+} GNU [-has certain
 # | associations, which people will discover once they hear the name.  GNU is
 # | associated-] {+associate it+} with the ideals of freedom of the free
@@ -97,7 +85,7 @@
 "متصل بفكرة الحرية وحركة البرمجيات الحرة. 
هذه الصلة لم تنتج بمحض مصادفة لأن "
 "الحافز لتطوير غنو كان أساسًا جعل استخدام 
الحاسوب مع امتلاك الحرية ممكنًا."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | {+A person seeing the name &ldquo;GNU&rdquo; for the first time in
 # | &ldquo;GNU/Linux&rdquo; won't immediately know what it represents, but has
 # | come one step closer to finding out.+}  The association between the name
@@ -145,7 +133,7 @@
 "النظام أساسًا هو غنو، فسوف يجذبهم ذلك خطوة 
أقرب لتعلم قيمنا ومبادئنا. قد "
 "يتلهفون للبحث عن المزيد من المعلومات عن 
غنو."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | If they don't [-look for it,-] {+search,+} they may encounter [-it-]
 # | {+them+} anyway.  The <a
 # | href=\"/philosophy/open-source-misses-the-point.html\">&ldquo;open
@@ -183,16 +171,16 @@
 "يصادف القارئ تلك المعلومات، فمن المرجح 
أنه سيلقي بالًا للمعلومات المتعلقة "
 "بغنو (مثل أنه حملة للحرية وللمجتمع) إذا عرف 
أنه مستخدم لنظام غنو."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of
 # | the ideals of freedom for which we developed the GNU system.  It is also
 # | useful as a reminder for people in our community who know about these
 # | ideals, in a world where much of discussion of free software takes a
 # | totally practical (and thus amoral) approach.  When we ask you to call the
-# | system &ldquo;GNU/Linux&rdquo;, we [-do so because awareness of GNU slowly
-# | but surely brings with it awareness-] {+are asking you to help in making
-# | the public aware+} of the free software [-ideals of freedom and
-# | community.-] {+ideals.+}
+# | system [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} we [-do
+# | so because awareness of GNU slowly but surely brings with it awareness-]
+# | {+are asking you to help in making the public aware+} of the free software
+# | [-ideals of freedom and community.-] {+ideals.+}
 #, fuzzy
 #| msgid ""
 #| "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness "
@@ -209,7 +197,7 @@
 "useful as a reminder for people in our community who know about these "
 "ideals, in a world where much of discussion of free software takes a totally "
 "practical (and thus amoral) approach.  When we ask you to call the system "
-"&ldquo;GNU/Linux&rdquo;, we are asking you to help in making the public "
+"&ldquo;GNU/Linux,&rdquo; we are asking you to help in making the public "
 "aware of the free software ideals."
 msgstr ""
 "مع مرور الوقت سوف تنشر تسمية النظام 
&rdquo;غنو/لينكس&ldquo; إدراك قيم الحرية "
@@ -219,6 +207,29 @@
 "نقوم بذلك لأن الوعي بغنو بطيء ولكنه بلا شك 
يجلب معه مع الزمن إدارك مبدأيْ "
 "البرمجيات الحرة: الحرية والمجتمع."
 
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>.-]
+# | {+System</a>.+}
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
+#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-"
+#| "gnu.html\">Linux and the GNU Project</a>."
+msgid ""
+"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
+"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>."
+msgstr ""
+"لتعلم المزيد حول هذه القضية، تستطيع أيضا 
قراءة<a href=\"/gnu/gnu-linux-faq."
+"html\">أسئلة غنو/لينكس الشائعة</a>، وصفحتنا 
حول <a href=\"/gnu/why-gnu-linux."
+"html\">لماذا غنو/لينكس؟</a>، وصفحتنا عن <a 
href=\"/gnu/linux-and-gnu.html"
+"\">لينكس ومشروع غنو</a>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -263,18 +274,14 @@
 "href=\"/server/standards/README.translations.html\">دليل الترجم
Ø©</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2006, 2007, [-2013, 2014-] {+2013-2015, 2017, 2019,
-# | 2021+} Free Software Foundation, Inc.
+# | Copyright &copy; [-2014-] {+2006, 2015, 2021+} Free Software Foundation,
+# | Inc.
 #, fuzzy
-#| msgid ""
-#| "Copyright &copy; 2006, 2007, 2013, 2014 Free Software Foundation, Inc."
-msgid ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
+#| msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc."
 msgstr ""
-"حقوق النشر:</p><p style=\"direction: ltr\">\n"
-"Copyright &copy; 2006, 2007, 2013, 2014 Free Software Foundation, Inc. "
-"(مؤسسة البرمجيات الحرة)"
+"حقوق النشر:<br />\n"
+"Copyright &copy; 2014 Free Software Foundation, Inc. (مؤسسة البرم
جيات الحرة)"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -298,6 +305,17 @@
 msgid "Updated:"
 msgstr "حُدّثت:"
 
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 2006, 2007, 2013, 2014 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "حقوق النشر:</p><p style=\"direction: ltr\">\n"
+#~ "Copyright &copy; 2006, 2007, 2013, 2014 Free Software Foundation, Inc. "
+#~ "(مؤسسة البرمجيات الحرة)"
+
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"

Index: gnu/po/gnu-users-never-heard-of-gnu.bg-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.bg-diff.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gnu/po/gnu-users-never-heard-of-gnu.bg-diff.html    30 May 2021 18:30:20 
-0000      1.8
+++ gnu/po/gnu-users-never-heard-of-gnu.bg-diff.html    30 Aug 2021 13:34:53 
-0000      1.9
@@ -10,41 +10,36 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;GNU Users Who Have Never Heard of GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/gnu/po/gnu-users-never-heard-of-gnu.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;GNU</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;GNU</em></ins></span> 
Users Who Have Never Heard <span class="removed"><del><strong>of GNU&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;GNU Users Who Have Never Heard <span class="removed"><del><strong>of 
GNU&lt;/h2&gt;
 
-&lt;p&gt;&lt;strong&gt;by</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU&lt;/h2&gt;
+&lt;p&gt;&lt;strong&gt;by &lt;a href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
-&lt;address class="byline c"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
-<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;
-
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;To</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;To</em></ins></span> learn more about 
this issue, you can also read
+  &lt;blockquote&gt;&lt;p&gt;To learn more about this issue, you can also read
 our &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;, our page 
on 
 &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt; 
-and our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
Project&lt;/a&gt;.
-<span 
class="removed"><del><strong>&lt;/p&gt;&lt;/blockquote&gt;</strong></del></span>
-<span class="inserted"><ins><em>&lt;/p&gt;</em></ins></span>
-&lt;/div&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;
+and our page on</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU&lt;/h2&gt;
+
+&lt;address class="byline"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="/gnu/linux-and-gnu.html"&gt;Linux and the 
GNU Project&lt;/a&gt;.
+&lt;/p&gt;&lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;Most people have never heard of GNU.  Even most of the people who
 use the GNU system have never heard of GNU, <span 
class="removed"><del><strong>thanks to</strong></del></span> <span 
class="inserted"><ins><em>since</em></ins></span> so many people and
-companies <span class="removed"><del><strong>who</strong></del></span> teach 
them to call it &ldquo;Linux&rdquo;.  <span 
class="removed"><del><strong>Nonetheless,
-the name</strong></del></span>  <span 
class="inserted"><ins><em>Indeed,</em></ins></span> GNU <span 
class="removed"><del><strong>has certain associations, which people will 
discover once</strong></del></span>
-<span class="inserted"><ins><em>users often say</em></ins></span> they <span 
class="removed"><del><strong>hear the name.  GNU</strong></del></span> <span 
class="inserted"><ins><em>are &ldquo;running Linux&rdquo;, 
which</em></ins></span> is <span 
class="removed"><del><strong>associated</strong></del></span> <span 
class="inserted"><ins><em>like
+companies <span class="removed"><del><strong>who</strong></del></span> teach 
them to call it <span class="removed"><del><strong>&ldquo;Linux&rdquo;.  
Nonetheless,
+the name</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;  Indeed,</em></ins></span> GNU 
<span class="removed"><del><strong>has certain associations, which people will 
discover once</strong></del></span>
+<span class="inserted"><ins><em>users often say</em></ins></span> they <span 
class="removed"><del><strong>hear the name.  GNU</strong></del></span> <span 
class="inserted"><ins><em>are &ldquo;running Linux,&rdquo; 
which</em></ins></span> is <span 
class="removed"><del><strong>associated</strong></del></span> <span 
class="inserted"><ins><em>like
 saying you are &ldquo;driving your carburetor&rdquo; or
-&ldquo;driving your transmission&rdquo;.&lt;/p&gt;
+&ldquo;driving your transmission.&rdquo;&lt;/p&gt;
 
 &lt;p&gt;Nonetheless, those who know about GNU associate it</em></ins></span> 
with the ideals
 of freedom of the free software movement.  That association is no
@@ -64,9 +59,9 @@
 href="http://www.gnu.org"&gt;www.gnu.org&lt;/a&gt;, which talks about free
 software and freedom.&lt;/p&gt;
 
-&lt;p&gt;A person seeing the name &ldquo;GNU&rdquo; for</strong></del></span> 
the <span class="removed"><del><strong>first time in
+&lt;p&gt;A person seeing the name &ldquo;GNU&rdquo; for the first time in
 &ldquo;GNU/Linux&rdquo; won't immediately associate it with anything.
-However, when people know that the system is basically GNU, that brings
+However, when people know that</strong></del></span> the <span 
class="removed"><del><strong>system is basically GNU, that brings
 them a step closer to learning about our ideals.  For instance, they
 might become curious and look for more information about 
GNU.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>ideas GNU 
stands for.&lt;/p&gt;</em></ins></span>
 
@@ -86,10 +81,19 @@
 system.  It is also useful as a reminder for people in our community
 who know about these ideals, in a world where much of discussion of
 free software takes a totally practical (and thus amoral) approach.
-When we ask you to call the system &ldquo;GNU/Linux&rdquo;, we <span 
class="removed"><del><strong>do so because
+When we ask you to call the system <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> we 
<span class="removed"><del><strong>do so because
 awareness of GNU slowly but surely brings with it 
awareness</strong></del></span> <span class="inserted"><ins><em>are
-asking you to help in making the public aware</em></ins></span> of the free 
software <span class="removed"><del><strong>ideals of freedom and 
community.&lt;/p&gt;</strong></del></span>
+asking you to help in making the public aware</em></ins></span> of the free 
software <span class="removed"><del><strong>ideals of 
freedom</strong></del></span>
 <span class="inserted"><ins><em>ideals.&lt;/p&gt;
+
+&lt;div class="announcement comment" role="complementary"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;p&gt;To learn more about this issue, you can also read
+our &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;, our page 
on 
+&lt;a href="/gnu/why-gnu-linux.html"&gt;Why 
GNU/Linux?&lt;/a&gt;</em></ins></span> 
+and <span 
class="removed"><del><strong>community.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>our page on &lt;a 
href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU System&lt;/a&gt;.
+&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
 &lt;/div&gt;
 &lt;/div&gt;</em></ins></span>
 
@@ -140,7 +144,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2006, 2007, <span class="removed"><del><strong>2013, 
2014</strong></del></span> <span class="inserted"><ins><em>2013-2015, 2017, 
2019, 2021</em></ins></span> Free Software
+&lt;p&gt;Copyright &copy; 2006, <span class="removed"><del><strong>2007, 2013, 
2014</strong></del></span> <span class="inserted"><ins><em>2015, 
2021</em></ins></span> Free Software
 Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
@@ -152,11 +156,12 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/30 18:30:20 $
+$Date: 2021/08/30 13:34:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-&lt;/div&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for class="inner", starts 
in the banner include --&gt;</em></ins></span>
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>

Index: gnu/po/gnu-users-never-heard-of-gnu.bg.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.bg.po,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- gnu/po/gnu-users-never-heard-of-gnu.bg.po   30 May 2021 18:30:20 -0000      
1.25
+++ gnu/po/gnu-users-never-heard-of-gnu.bg.po   30 Aug 2021 13:34:53 -0000      
1.26
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2009-06-24 14:53+0300\n"
 "Last-Translator: Yavor Doganov <yavor@gnu.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -26,38 +26,26 @@
 "Потребители на GNU, които никога не са 
чували за GNU - Проектът GNU - "
 "Фондация за свободен софтуер"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU Users Who Have Never Heard of&nbsp;GNU"
 msgstr "Потребители на GNU, които никога не са 
чували за&nbsp;GNU"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "от <a href=\"https://www.stallman.org/\";>Ричард 
Столман</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
-"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>."
-msgstr ""
-"За да научите повече по този въпрос, може 
да прочетете нашите <a href=\"/gnu/"
-"gnu-linux-faq.html\">ЧЗВ за GNU/Линукс</a>, както и 
статиите <a href=\"/gnu/"
-"why-gnu-linux.html\">Защо GNU/Линукс?</a> и <a 
href=\"/gnu/linux-and-gnu.html"
-"\">Линукс и проектът GNU</a>."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Most people have never heard of GNU.  Even most of the people who use the
 # | GNU system have never heard of GNU, [-thanks to-] {+since+} so many people
-# | and companies [-who-] teach them to call it &ldquo;Linux&rdquo;. 
-# | [-Nonetheless, the name-]  {+Indeed,+} GNU [-has certain associations,
-# | which people will discover once-] {+users often say+} they [-hear the
-# | name.  GNU is associated with the ideals of freedom of the free software
-# | movement.  That association-] {+are &ldquo;running Linux&rdquo;, which+}
-# | is [-no accident; the motive for developing GNU was specifically to make
-# | it possible to use a computer and have freedom.-] {+like saying you are
-# | &ldquo;driving your carburetor&rdquo; or &ldquo;driving your
-# | transmission&rdquo;.+}
+# | and companies [-who-] teach them to call it [-&ldquo;Linux&rdquo;. 
+# | Nonetheless, the name-] {+&ldquo;Linux.&rdquo; Indeed,+} GNU [-has certain
+# | associations, which people will discover once-] {+users often say+} they
+# | [-hear the name.  GNU is associated with the ideals of freedom of the free
+# | software movement.  That association-] {+are &ldquo;running Linux,&rdquo;
+# | which+} is [-no accident; the motive for developing GNU was specifically
+# | to make it possible to use a computer and have freedom.-] {+like saying
+# | you are &ldquo;driving your carburetor&rdquo; or &ldquo;driving your
+# | transmission.&rdquo;+}
 #, fuzzy
 #| msgid ""
 #| "Most people have never heard of GNU.  Even most of the people who use the "
@@ -71,9 +59,9 @@
 msgid ""
 "Most people have never heard of GNU.  Even most of the people who use the "
 "GNU system have never heard of GNU, since so many people and companies teach "
-"them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say they are "
-"&ldquo;running Linux&rdquo;, which is like saying you are &ldquo;driving "
-"your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
+"them to call it &ldquo;Linux.&rdquo; Indeed, GNU users often say they are "
+"&ldquo;running Linux,&rdquo; which is like saying you are &ldquo;driving "
+"your carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;"
 msgstr ""
 "Повечето хора никога не са чували за GNU.  
Дори повечето потребители на "
 "системата GNU никога не са чували за GNU, 
благодарение на много хора и "
@@ -83,7 +71,7 @@
 "асоциация не е случайна; мотивът за 
разработката на GNU беше именно да бъде "
 "възможно да се използва компютър и да 
имаме свобода."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | [-Most people have never heard of GNU.  Even most of the
 # | people-]{+Nonetheless, those+} who [-use the-] {+know about+} GNU [-system
 # | have never heard of GNU, thanks to so many people and companies who teach
@@ -117,7 +105,7 @@
 "асоциация не е случайна; мотивът за 
разработката на GNU беше именно да бъде "
 "възможно да се използва компютър и да 
имаме свобода."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | {+A person seeing the name &ldquo;GNU&rdquo; for the first time in
 # | &ldquo;GNU/Linux&rdquo; won't immediately know what it represents, but has
 # | come one step closer to finding out.+}  The association between the name
@@ -166,7 +154,7 @@
 "приближава една стъпка до научаването за 
нашите идеали.  Например, те биха "
 "станали любопитни и биха потърсили повече 
информация относно GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | If they don't [-look for it,-] {+search,+} they may encounter [-it-]
 # | {+them+} anyway.  The [-&ldquo;open source&rdquo;-] {+<a
 # | href=\"/philosophy/open-source-misses-the-point.html\">&ldquo;open
@@ -203,16 +191,16 @@
 "да обърне внимание на информация относно 
GNU (като това, че е следствие на "
 "кампания за свобода и общност), ако знае, 
че е потребител на системата GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of
 # | the ideals of freedom for which we developed the GNU system.  It is also
 # | useful as a reminder for people in our community who know about these
 # | ideals, in a world where much of discussion of free software takes a
 # | totally practical (and thus amoral) approach.  When we ask you to call the
-# | system &ldquo;GNU/Linux&rdquo;, we [-do so because awareness of GNU slowly
-# | but surely brings with it awareness-] {+are asking you to help in making
-# | the public aware+} of the free software [-ideals of freedom and
-# | community.-] {+ideals.+}
+# | system [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} we [-do
+# | so because awareness of GNU slowly but surely brings with it awareness-]
+# | {+are asking you to help in making the public aware+} of the free software
+# | [-ideals of freedom and community.-] {+ideals.+}
 #, fuzzy
 #| msgid ""
 #| "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness "
@@ -229,7 +217,7 @@
 "useful as a reminder for people in our community who know about these "
 "ideals, in a world where much of discussion of free software takes a totally "
 "practical (and thus amoral) approach.  When we ask you to call the system "
-"&ldquo;GNU/Linux&rdquo;, we are asking you to help in making the public "
+"&ldquo;GNU/Linux,&rdquo; we are asking you to help in making the public "
 "aware of the free software ideals."
 msgstr ""
 "В дългосрочен план, назоваването на 
системата „GNU/Линукс“ спомага за "
@@ -241,6 +229,29 @@
 "съзнанието за GNU бавно, но сигурно води до 
съзнаването на идеалите за "
 "софтуерна свобода и общност."
 
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>.-]
+# | {+System</a>.+}
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
+#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-"
+#| "gnu.html\">Linux and the GNU Project</a>."
+msgid ""
+"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
+"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>."
+msgstr ""
+"За да научите повече по този въпрос, може 
да прочетете нашите <a href=\"/gnu/"
+"gnu-linux-faq.html\">ЧЗВ за GNU/Линукс</a>, както и 
статиите <a href=\"/gnu/"
+"why-gnu-linux.html\">Защо GNU/Линукс?</a> и <a 
href=\"/gnu/linux-and-gnu.html"
+"\">Линукс и проектът GNU</a>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -284,17 +295,12 @@
 "подаването на преводи на тази статия."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2006, 2007, [-2013, 2014-] {+2013-2015, 2017, 2019,
-# | 2021+} Free Software Foundation, Inc.
+# | Copyright &copy; [-2009-] {+2006, 2015, 2021+} Free Software Foundation,
+# | Inc.
 #, fuzzy
-#| msgid ""
-#| "Copyright &copy; 2006, 2007, 2013, 2014 Free Software Foundation, Inc."
-msgid ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2006, 2007, 2013, 2014 Free Software Foundation, Inc. "
-"(Фондация за свободен софтуер)"
+#| msgid "Copyright &copy; 2009 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc."
+msgstr "Авторски права &copy; 2009 Фондация за 
свободен софтуер"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -318,6 +324,16 @@
 msgid "Updated:"
 msgstr "Последно обновяване:"
 
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 2006, 2007, 2013, 2014 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2006, 2007, 2013, 2014 Free Software Foundation, Inc. "
+#~ "(Фондация за свободен софтуер)"
+
 #~ msgid ""
 #~ "A person seeing the name &ldquo;GNU&rdquo; for the first time in &ldquo;"
 #~ "GNU/Linux&rdquo; won't immediately associate it with anything.  However, "

Index: gnu/po/gnu-users-never-heard-of-gnu.ca.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.ca.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- gnu/po/gnu-users-never-heard-of-gnu.ca.po   7 Jun 2021 07:59:35 -0000       
1.32
+++ gnu/po/gnu-users-never-heard-of-gnu.ca.po   30 Aug 2021 13:34:53 -0000      
1.33
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2015-09-07 10:37+0200\n"
 "Last-Translator: Miquel Puigpelat <mpuigpe1@xtec.cat>\n"
 "Language-Team: Catalan <www-ca-traductors@gnu.org>\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -25,33 +26,35 @@
 "Usuaris de GNU que mai no han sentit parlar de GNU - Projecte GNU - Free "
 "Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU Users Who Have Never Heard of&nbsp;GNU"
 msgstr "Usuaris de GNU que mai no han sentit parlar de GNU"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "per <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
-"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>."
-msgstr ""
-"Per saber més sobre aquest tema podeu llegir les nostres <a href=\"/gnu/gnu-"
-"linux-faq.html\">Preguntes freqüents sobre GNU/Linux</a>, la pàgina <a 
href="
-"\"/gnu/why-gnu-linux.html\">Per què GNU/Linux?</a> i la nostra pàgina sobre 
"
-"<a href=\"/gnu/linux-and-gnu.html\">Linux i el Projecte GNU</a>."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Most people have never heard of GNU.  Even most of the people who use the
+# | GNU system have never heard of GNU, since so many people and companies
+# | teach them to call it [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+# | Indeed, GNU users often say they are &ldquo;running [-Linux&rdquo;,-]
+# | {+Linux,&rdquo;+} which is like saying you are &ldquo;driving your
+# | carburetor&rdquo; or &ldquo;driving your [-transmission&rdquo;.-]
+# | {+transmission.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Most people have never heard of GNU.  Even most of the people who use the "
+#| "GNU system have never heard of GNU, since so many people and companies "
+#| "teach them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say "
+#| "they are &ldquo;running Linux&rdquo;, which is like saying you are &ldquo;"
+#| "driving your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
 msgid ""
 "Most people have never heard of GNU.  Even most of the people who use the "
 "GNU system have never heard of GNU, since so many people and companies teach "
-"them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say they are "
-"&ldquo;running Linux&rdquo;, which is like saying you are &ldquo;driving "
-"your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
+"them to call it &ldquo;Linux.&rdquo; Indeed, GNU users often say they are "
+"&ldquo;running Linux,&rdquo; which is like saying you are &ldquo;driving "
+"your carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;"
 msgstr ""
 "La major part de la gent mai no ha sentit parlar de GNU. Fins i tot la major "
 "part de la gent que utilitza el sistema GNU mai no ha sentit parlar de GNU, "
@@ -60,7 +63,7 @@
 "«utilitzen Linux», que és com dir «conduir el carburador» or «conduir 
la "
 "transmissió»."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonetheless, those who know about GNU associate it with the ideals of "
 "freedom of the free software movement.  That association is no accident; the "
@@ -72,7 +75,7 @@
 "motiu per desenvolupar GNU va ser específicament fer possible utilitzar un "
 "ordinador i tenir llibertat."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "A person seeing the name &ldquo;GNU&rdquo; for the first time in &ldquo;GNU/"
 "Linux&rdquo; won't immediately know what it represents, but has come one "
@@ -90,7 +93,7 @@
 "i a la Viquipèdia. I existeix a la web; si aquests usuaris busquen GNU, "
 "trobaran les idees que GNU representa."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If they don't search, they may encounter them anyway.  The <a href=\"/"
 "philosophy/open-source-misses-the-point.html\">&ldquo;open source&rdquo;</a> "
@@ -110,14 +113,30 @@
 "(per exemple, que és l'obra d'una campanya per la llibertat i l'esperit "
 "comunitari) si sap que ell mateix és un usuari del sistema GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of
+# | the ideals of freedom for which we developed the GNU system.  It is also
+# | useful as a reminder for people in our community who know about these
+# | ideals, in a world where much of discussion of free software takes a
+# | totally practical (and thus amoral) approach.  When we ask you to call the
+# | system [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} we are
+# | asking you to help in making the public aware of the free software ideals.
+#, fuzzy
+#| msgid ""
+#| "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness "
+#| "of the ideals of freedom for which we developed the GNU system.  It is "
+#| "also useful as a reminder for people in our community who know about "
+#| "these ideals, in a world where much of discussion of free software takes "
+#| "a totally practical (and thus amoral) approach.  When we ask you to call "
+#| "the system &ldquo;GNU/Linux&rdquo;, we are asking you to help in making "
+#| "the public aware of the free software ideals."
 msgid ""
 "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of "
 "the ideals of freedom for which we developed the GNU system.  It is also "
 "useful as a reminder for people in our community who know about these "
 "ideals, in a world where much of discussion of free software takes a totally "
 "practical (and thus amoral) approach.  When we ask you to call the system "
-"&ldquo;GNU/Linux&rdquo;, we are asking you to help in making the public "
+"&ldquo;GNU/Linux,&rdquo; we are asking you to help in making the public "
 "aware of the free software ideals."
 msgstr ""
 "A la llarga, anomenar al sistema «GNU/Linux» difon la consciència dels "
@@ -129,6 +148,29 @@
 "demanant que ens ajudeu a difondre la consciència dels ideals del programari 
"
 "lliure."
 
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>.-]
+# | {+System</a>.+}
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
+#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-"
+#| "gnu.html\">Linux and the GNU Project</a>."
+msgid ""
+"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
+"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>."
+msgstr ""
+"Per saber més sobre aquest tema podeu llegir les nostres <a href=\"/gnu/gnu-"
+"linux-faq.html\">Preguntes freqüents sobre GNU/Linux</a>, la pàgina <a 
href="
+"\"/gnu/why-gnu-linux.html\">Per què GNU/Linux?</a> i la nostra pàgina sobre 
"
+"<a href=\"/gnu/linux-and-gnu.html\">Linux i el Projecte GNU</a>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -171,13 +213,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>
-msgid ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2006, 2007, 2013, 2014, 2015, 2017, 2019, 2021 Free "
-"Software Foundation, Inc."
+# | Copyright &copy; [-2014, 2015-] {+2006, 2015, 2021+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -200,3 +243,10 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Updated:"
+
+#~ msgid ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2006, 2007, 2013, 2014, 2015, 2017, 2019, 2021 Free "
+#~ "Software Foundation, Inc."

Index: gnu/po/gnu-users-never-heard-of-gnu.cs-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.cs-diff.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gnu/po/gnu-users-never-heard-of-gnu.cs-diff.html    30 May 2021 19:03:10 
-0000      1.15
+++ gnu/po/gnu-users-never-heard-of-gnu.cs-diff.html    30 Aug 2021 13:34:53 
-0000      1.16
@@ -10,41 +10,36 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;GNU Users Who Have Never Heard of GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/gnu/po/gnu-users-never-heard-of-gnu.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;GNU</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;GNU</em></ins></span> 
Users Who Have Never Heard <span class="removed"><del><strong>of GNU&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;GNU Users Who Have Never Heard <span class="removed"><del><strong>of 
GNU&lt;/h2&gt;
 
-&lt;p&gt;&lt;strong&gt;by</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU&lt;/h2&gt;
+&lt;p&gt;&lt;strong&gt;by &lt;a href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
-&lt;address class="byline c"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
-<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;
-
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;To</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;To</em></ins></span> learn more about 
this issue, you can also read
+  &lt;blockquote&gt;&lt;p&gt;To learn more about this issue, you can also read
 our &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;, our page 
on 
 &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt; 
-and our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
Project&lt;/a&gt;.
-<span 
class="removed"><del><strong>&lt;/p&gt;&lt;/blockquote&gt;</strong></del></span>
-<span class="inserted"><ins><em>&lt;/p&gt;</em></ins></span>
-&lt;/div&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;
+and our page on</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU&lt;/h2&gt;
+
+&lt;address class="byline"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="/gnu/linux-and-gnu.html"&gt;Linux and the 
GNU Project&lt;/a&gt;.
+&lt;/p&gt;&lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;Most people have never heard of GNU.  Even most of the people who
 use the GNU system have never heard of GNU, <span 
class="removed"><del><strong>thanks to</strong></del></span> <span 
class="inserted"><ins><em>since</em></ins></span> so many people and
-companies <span class="removed"><del><strong>who</strong></del></span> teach 
them to call it &ldquo;Linux&rdquo;.  <span 
class="removed"><del><strong>Nonetheless,
-the name</strong></del></span>  <span 
class="inserted"><ins><em>Indeed,</em></ins></span> GNU <span 
class="removed"><del><strong>has certain associations, which people will 
discover once</strong></del></span>
-<span class="inserted"><ins><em>users often say</em></ins></span> they <span 
class="removed"><del><strong>hear the name.  GNU</strong></del></span> <span 
class="inserted"><ins><em>are &ldquo;running Linux&rdquo;, 
which</em></ins></span> is <span 
class="removed"><del><strong>associated</strong></del></span> <span 
class="inserted"><ins><em>like
+companies <span class="removed"><del><strong>who</strong></del></span> teach 
them to call it <span class="removed"><del><strong>&ldquo;Linux&rdquo;.  
Nonetheless,
+the name</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;  Indeed,</em></ins></span> GNU 
<span class="removed"><del><strong>has certain associations, which people will 
discover once</strong></del></span>
+<span class="inserted"><ins><em>users often say</em></ins></span> they <span 
class="removed"><del><strong>hear the name.  GNU</strong></del></span> <span 
class="inserted"><ins><em>are &ldquo;running Linux,&rdquo; 
which</em></ins></span> is <span 
class="removed"><del><strong>associated</strong></del></span> <span 
class="inserted"><ins><em>like
 saying you are &ldquo;driving your carburetor&rdquo; or
-&ldquo;driving your transmission&rdquo;.&lt;/p&gt;
+&ldquo;driving your transmission.&rdquo;&lt;/p&gt;
 
 &lt;p&gt;Nonetheless, those who know about GNU associate it</em></ins></span> 
with the ideals
 of freedom of the free software movement.  That association is no
@@ -64,9 +59,9 @@
 href="http://www.gnu.org"&gt;www.gnu.org&lt;/a&gt;, which talks about free
 software and freedom.&lt;/p&gt;
 
-&lt;p&gt;A person seeing the name &ldquo;GNU&rdquo; for</strong></del></span> 
the <span class="removed"><del><strong>first time in
+&lt;p&gt;A person seeing the name &ldquo;GNU&rdquo; for the first time in
 &ldquo;GNU/Linux&rdquo; won't immediately associate it with anything.
-However, when people know that the system is basically GNU, that brings
+However, when people know that</strong></del></span> the <span 
class="removed"><del><strong>system is basically GNU, that brings
 them a step closer to learning about our ideals.  For instance, they
 might become curious and look for more information about 
GNU.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>ideas GNU 
stands for.&lt;/p&gt;</em></ins></span>
 
@@ -86,10 +81,19 @@
 system.  It is also useful as a reminder for people in our community
 who know about these ideals, in a world where much of discussion of
 free software takes a totally practical (and thus amoral) approach.
-When we ask you to call the system &ldquo;GNU/Linux&rdquo;, we <span 
class="removed"><del><strong>do so because
+When we ask you to call the system <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> we 
<span class="removed"><del><strong>do so because
 awareness of GNU slowly but surely brings with it 
awareness</strong></del></span> <span class="inserted"><ins><em>are
-asking you to help in making the public aware</em></ins></span> of the free 
software <span class="removed"><del><strong>ideals of freedom and 
community.&lt;/p&gt;</strong></del></span>
+asking you to help in making the public aware</em></ins></span> of the free 
software <span class="removed"><del><strong>ideals of 
freedom</strong></del></span>
 <span class="inserted"><ins><em>ideals.&lt;/p&gt;
+
+&lt;div class="announcement comment" role="complementary"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;p&gt;To learn more about this issue, you can also read
+our &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;, our page 
on 
+&lt;a href="/gnu/why-gnu-linux.html"&gt;Why 
GNU/Linux?&lt;/a&gt;</em></ins></span> 
+and <span 
class="removed"><del><strong>community.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>our page on &lt;a 
href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU System&lt;/a&gt;.
+&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
 &lt;/div&gt;
 &lt;/div&gt;</em></ins></span>
 
@@ -140,7 +144,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2006, 2007, <span class="removed"><del><strong>2013, 
2014</strong></del></span> <span class="inserted"><ins><em>2013-2015, 2017, 
2019, 2021</em></ins></span> Free Software
+&lt;p&gt;Copyright &copy; 2006, <span class="removed"><del><strong>2007, 2013, 
2014</strong></del></span> <span class="inserted"><ins><em>2015, 
2021</em></ins></span> Free Software
 Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
@@ -152,11 +156,12 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/30 19:03:10 $
+$Date: 2021/08/30 13:34:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-&lt;/div&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for class="inner", starts 
in the banner include --&gt;</em></ins></span>
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>

Index: gnu/po/gnu-users-never-heard-of-gnu.cs.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.cs.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gnu/po/gnu-users-never-heard-of-gnu.cs.po   30 May 2021 19:03:10 -0000      
1.15
+++ gnu/po/gnu-users-never-heard-of-gnu.cs.po   30 Aug 2021 13:34:53 -0000      
1.16
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2012-07-15 19:13+0200\n"
 "Last-Translator: František Kučera <franta-gnu@frantovo.cz>\n"
 "Language-Team: Czech <www-cs-general@gnu.org>\n"
@@ -30,7 +30,7 @@
 "Uživatelé GNU, kteří nikdy neslyšeli o GNU – Projekt GNU – Nadace 
pro "
 "svobodný software"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 # | GNU Users Who Have Never Heard [-of GNU-] {+of&nbsp;GNU+}
 #, fuzzy
 #| msgid "GNU Users Who Have Never Heard of GNU"
@@ -38,32 +38,20 @@
 msgstr "Uživatelé GNU, kteří nikdy neslyšeli o GNU"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 # | by <a href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a>
 #, fuzzy
 #| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "od <a href=\"http://www.stallman.org/\";>Richarda Stallmana</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
-"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>."
-msgstr ""
-"Pro více informací o tomto tématu si přečtěte <a 
href=\"/gnu/gnu-linux-faq."
-"html\">GNU/Linux FAQ</a> a naše stránky <a href=\"/gnu/why-gnu-linux.html"
-"\">Proč GNU/Linux?</a> a <a href=\"/gnu/linux-and-gnu.html\">Linux a projekt 
"
-"GNU</a>."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Most people have never heard of GNU.  Even most of the people who use the
 # | GNU system have never heard of GNU, [-thanks to-] {+since+} so many people
-# | and companies [-who-] teach them to call it &ldquo;Linux&rdquo;. 
-# | {+Indeed, GNU users often say they are &ldquo;running Linux&rdquo;, which
-# | is like saying you are &ldquo;driving your carburetor&rdquo; or
-# | &ldquo;driving your transmission&rdquo;.+}
+# | and companies [-who-] teach them to call it [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo; Indeed, GNU users often say they are &ldquo;running
+# | Linux,&rdquo; which is like saying you are &ldquo;driving your
+# | carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;+}
 #, fuzzy
 #| msgid ""
 #| "Most people have never heard of GNU.  Even most of the people who use the "
@@ -72,15 +60,15 @@
 msgid ""
 "Most people have never heard of GNU.  Even most of the people who use the "
 "GNU system have never heard of GNU, since so many people and companies teach "
-"them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say they are "
-"&ldquo;running Linux&rdquo;, which is like saying you are &ldquo;driving "
-"your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
+"them to call it &ldquo;Linux.&rdquo; Indeed, GNU users often say they are "
+"&ldquo;running Linux,&rdquo; which is like saying you are &ldquo;driving "
+"your carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;"
 msgstr ""
 "Většina lidí nikdy neslyšela o GNU. Dokonce většina lidí, kteří 
používají "
 "systém GNU, neslyšela o GNU kvůli mnohým lidem a firmám, kteří je 
naučili ho "
 "nazývat „Linux“."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Nonetheless, [-the name-] {+those who know about+} GNU [-has certain
 # | associations, which people will discover once they hear the name.  GNU is
 # | associated-] {+associate it+} with the ideals of freedom of the free
@@ -105,7 +93,7 @@
 "Tato spojitost není náhodná: důvodem vzniku GNU výslovně bylo umožnit 
lidem "
 "používat počítače a být při tom svobodný."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | {+A person seeing the name &ldquo;GNU&rdquo; for the first time in
 # | &ldquo;GNU/Linux&rdquo; won't immediately know what it represents, but has
 # | come one step closer to finding out.+}  The association between the name
@@ -151,7 +139,7 @@
 "s našimi ideály. Např. můžou být zvědaví a hledat informace o tom, co 
je to "
 "GNU. "
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | If they don't [-look for it,-] {+search,+} they may encounter [-it-]
 # | {+them+} anyway.  The [-&ldquo;open source&rdquo;-] {+<a
 # | href=\"/philosophy/open-source-misses-the-point.html\">&ldquo;open
@@ -189,16 +177,16 @@
 "informacím o GNU (např. že je to práce na kampani za svobodu a komunitu), 
"
 "pokud ví, že je uživatelem GNU systému."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of
 # | the ideals of freedom for which we developed the GNU system.  It is also
 # | useful as a reminder for people in our community who know about these
 # | ideals, in a world where much of discussion of free software takes a
 # | totally practical (and thus amoral) approach.  When we ask you to call the
-# | system &ldquo;GNU/Linux&rdquo;, we [-do so because awareness of GNU slowly
-# | but surely brings with it awareness-] {+are asking you to help in making
-# | the public aware+} of the free software [-ideals of freedom and
-# | community.-] {+ideals.+}
+# | system [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} we [-do
+# | so because awareness of GNU slowly but surely brings with it awareness-]
+# | {+are asking you to help in making the public aware+} of the free software
+# | [-ideals of freedom and community.-] {+ideals.+}
 #, fuzzy
 #| msgid ""
 #| "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness "
@@ -215,7 +203,7 @@
 "useful as a reminder for people in our community who know about these "
 "ideals, in a world where much of discussion of free software takes a totally "
 "practical (and thus amoral) approach.  When we ask you to call the system "
-"&ldquo;GNU/Linux&rdquo;, we are asking you to help in making the public "
+"&ldquo;GNU/Linux,&rdquo; we are asking you to help in making the public "
 "aware of the free software ideals."
 msgstr ""
 "V průběhu času se díky nazývání systému jménem „GNU/Linux“ 
šíří povědomí o "
@@ -226,6 +214,29 @@
 "činíme tak proto, že povědomí o GNU pomalu ale jistě přináší i 
povědomí o "
 "ideálech svobodného softwaru a komunity."
 
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>.-]
+# | {+System</a>.+}
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
+#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-"
+#| "gnu.html\">Linux and the GNU Project</a>."
+msgid ""
+"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
+"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>."
+msgstr ""
+"Pro více informací o tomto tématu si přečtěte <a 
href=\"/gnu/gnu-linux-faq."
+"html\">GNU/Linux FAQ</a> a naše stránky <a href=\"/gnu/why-gnu-linux.html"
+"\">Proč GNU/Linux?</a> a <a href=\"/gnu/linux-and-gnu.html\">Linux a projekt 
"
+"GNU</a>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -276,15 +287,12 @@
 "se dozvíte, jak koordinovat svoji práci a posílat překlady tohoto 
článku."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2006, 2007, [-2013, 2014-] {+2013-2015, 2017, 2019,
-# | 2021+} Free Software Foundation, Inc.
+# | Copyright &copy; [-2011, 2012-] {+2006, 2015, 2021+} Free Software
+# | Foundation, Inc.
 #, fuzzy
-#| msgid ""
-#| "Copyright &copy; 2006, 2007, 2013, 2014 Free Software Foundation, Inc."
-msgid ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
-msgstr "Copyright &copy; 2006, 2007, 2013, 2014 Free Software Foundation, Inc."
+#| msgid "Copyright &copy; 2011, 2012 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2011, 2012 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -306,6 +314,15 @@
 msgid "Updated:"
 msgstr "Aktualizováno:"
 
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 2006, 2007, 2013, 2014 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2006, 2007, 2013, 2014 Free Software Foundation, Inc."
+
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"

Index: gnu/po/gnu-users-never-heard-of-gnu.de.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.de.po,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- gnu/po/gnu-users-never-heard-of-gnu.de.po   31 May 2021 13:39:47 -0000      
1.41
+++ gnu/po/gnu-users-never-heard-of-gnu.de.po   30 Aug 2021 13:34:53 -0000      
1.42
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
 "Report-Msgid-Bugs-To: webmasters@gnu.org\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2017-09-26 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"
@@ -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-08-30 13:26+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -26,34 +27,35 @@
 "GNU-Benutzer, die noch nie von GNU gehört haben - GNU-Projekt - Free "
 "Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU Users Who Have Never Heard of&nbsp;GNU"
 msgstr "GNU-Benutzer, die noch nie von GNU gehört&nbsp;haben"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "von <a href=\"//www.stallman.org/\">Richard Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
-"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>."
-msgstr ""
-"Um weitere Informationen zu diesem Thema zu erhalten, siehe <cite><a href=\"/"
-"gnu/gnu-linux-faq\">GNU/Linux: Häufig gestellte Fragen</a></cite>, <cite><a 
"
-"href=\"/gnu/why-gnu-linux\">GNU/Linux. Ist der Name Schall und Rauch?</a></"
-"cite> und <cite><a href=\"/gnu/linux-and-gnu\">Das GNU-System und Linux</a></"
-"cite>."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Most people have never heard of GNU.  Even most of the people who use the
+# | GNU system have never heard of GNU, since so many people and companies
+# | teach them to call it [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+# | Indeed, GNU users often say they are &ldquo;running [-Linux&rdquo;,-]
+# | {+Linux,&rdquo;+} which is like saying you are &ldquo;driving your
+# | carburetor&rdquo; or &ldquo;driving your [-transmission&rdquo;.-]
+# | {+transmission.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Most people have never heard of GNU.  Even most of the people who use the "
+#| "GNU system have never heard of GNU, since so many people and companies "
+#| "teach them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say "
+#| "they are &ldquo;running Linux&rdquo;, which is like saying you are &ldquo;"
+#| "driving your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
 msgid ""
 "Most people have never heard of GNU.  Even most of the people who use the "
 "GNU system have never heard of GNU, since so many people and companies teach "
-"them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say they are "
-"&ldquo;running Linux&rdquo;, which is like saying you are &ldquo;driving "
-"your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
+"them to call it &ldquo;Linux.&rdquo; Indeed, GNU users often say they are "
+"&ldquo;running Linux,&rdquo; which is like saying you are &ldquo;driving "
+"your carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;"
 msgstr ""
 "Die meisten Menschen haben noch nie von <b>GNU</b> gehört. Selbst die, die "
 "das GNU-System nutzen, haben noch nie von GNU gehört, da so viele Menschen "
@@ -62,7 +64,7 @@
 "würde man <em>„seinen Vergaser fahren\"</em> oder <em>„sein Getriebe 
fahren"
 "\"</em> sagen."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonetheless, those who know about GNU associate it with the ideals of "
 "freedom of the free software movement.  That association is no accident; the "
@@ -74,7 +76,7 @@
 "ungefähr. Der Beweggrund für die Entwicklung von GNU war insbesondere zu "
 "ermöglichen, einen Rechner benutzen zu können und Freiheit zu haben."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "A person seeing the name &ldquo;GNU&rdquo; for the first time in &ldquo;GNU/"
 "Linux&rdquo; won't immediately know what it represents, but has come one "
@@ -93,7 +95,7 @@
 "gesamten Internet existent; suchen diese Nutzer nach <em>GNU</em>, finden "
 "sie die Ideale, für die GNU steht."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If they don't search, they may encounter them anyway.  The <a href=\"/"
 "philosophy/open-source-misses-the-point.html\">&ldquo;open source&rdquo;</a> "
@@ -113,14 +115,30 @@
 "&#160;B..das ist das Werk einer Aktion für Freiheit und Gemeinschaft), wenn "
 "sie wissen, sie sind Nutzer des GNU-Systems."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of
+# | the ideals of freedom for which we developed the GNU system.  It is also
+# | useful as a reminder for people in our community who know about these
+# | ideals, in a world where much of discussion of free software takes a
+# | totally practical (and thus amoral) approach.  When we ask you to call the
+# | system [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} we are
+# | asking you to help in making the public aware of the free software ideals.
+#, fuzzy
+#| msgid ""
+#| "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness "
+#| "of the ideals of freedom for which we developed the GNU system.  It is "
+#| "also useful as a reminder for people in our community who know about "
+#| "these ideals, in a world where much of discussion of free software takes "
+#| "a totally practical (and thus amoral) approach.  When we ask you to call "
+#| "the system &ldquo;GNU/Linux&rdquo;, we are asking you to help in making "
+#| "the public aware of the free software ideals."
 msgid ""
 "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of "
 "the ideals of freedom for which we developed the GNU system.  It is also "
 "useful as a reminder for people in our community who know about these "
 "ideals, in a world where much of discussion of free software takes a totally "
 "practical (and thus amoral) approach.  When we ask you to call the system "
-"&ldquo;GNU/Linux&rdquo;, we are asking you to help in making the public "
+"&ldquo;GNU/Linux,&rdquo; we are asking you to help in making the public "
 "aware of the free software ideals."
 msgstr ""
 "Im Laufe der Zeit verbreitet die Nennung des Systems <em>GNU/Linux</em> das "
@@ -132,6 +150,30 @@
 "<em>GNU/Linux</em> zu nennen, bitten wir Sie um Hilfe bei der "
 "Sensibilisierung der Öffentlichkeit für die Freie-Software-ideale."
 
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>.-]
+# | {+System</a>.+}
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
+#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-"
+#| "gnu.html\">Linux and the GNU Project</a>."
+msgid ""
+"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
+"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>."
+msgstr ""
+"Um weitere Informationen zu diesem Thema zu erhalten, siehe <cite><a href=\"/"
+"gnu/gnu-linux-faq\">GNU/Linux: Häufig gestellte Fragen</a></cite>, <cite><a 
"
+"href=\"/gnu/why-gnu-linux\">GNU/Linux. Ist der Name Schall und Rauch?</a></"
+"cite> und <cite><a href=\"/gnu/linux-and-gnu\">Das GNU-System und Linux</a></"
+"cite>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -180,12 +222,12 @@
 "standards/README.translations\">LIESMICH für Übersetzungen</a>."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
+# | Copyright &copy; 2006, [-2007, 2013-] {+2015, 2021+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2006, 2007, 2013 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2006, 2007, 2013 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -211,6 +253,13 @@
 msgstr "Letzte Änderung:"
 
 #~ msgid ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+
+#~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"
 #~ msgstr ""
@@ -356,9 +405,6 @@
 #~ msgstr ""
 #~ "Copyright &copy; 2006, 2007, 2013, 2014 Free Software Foundation, Inc."
 
-#~ msgid "Copyright &copy; 2006, 2007, 2013 Free Software Foundation, Inc."
-#~ msgstr "Copyright &copy; 2006, 2007, 2013 Free Software Foundation, Inc."
-
 #~ msgid ""
 #~ "GNU Users Who Have Never Heard of GNU - GNU Project - Free Software "
 #~ "Foundation (FSF)"

Index: gnu/po/gnu-users-never-heard-of-gnu.es.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.es.po,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- gnu/po/gnu-users-never-heard-of-gnu.es.po   30 Apr 2021 09:12:02 -0000      
1.46
+++ gnu/po/gnu-users-never-heard-of-gnu.es.po   30 Aug 2021 13:34:53 -0000      
1.47
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-04-08 11:37+0200\n"
 "Last-Translator: Javier Fdez. Retenaga <jfrtnaga@gnu.org>\n"
 "Language-Team: Spanish <www-es-general@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-08-30 13:26+0000\n"
 "X-Generator: Poedit 2.2.1\n"
 
 # type: Content of: <title>
@@ -29,36 +30,37 @@
 "Software Foundation "
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU Users Who Have Never Heard of&nbsp;GNU"
 msgstr "Usuarios de GNU que nunca han oído hablar de&nbsp;GNU"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "por <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-# type: Content of: <div><blockquote><p>
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
-"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>."
-msgstr ""
-"Para saber más sobre este tema, puede leer también las <a href=\"/gnu/gnu-"
-"linux-faq.es.html\">preguntas más frecuentes acerca GNU/Linux</a>, además 
de "
-"nuestras paginas «<a href=\"/gnu/why-gnu-linux.es.html\">¿Por qué 
GNU/Linux?"
-"</a>» y <a href=\"/gnu/linux-and-gnu.es.html\">Linux y el proyecto GNU</a>."
-
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Most people have never heard of GNU.  Even most of the people who use the
+# | GNU system have never heard of GNU, since so many people and companies
+# | teach them to call it [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+# | Indeed, GNU users often say they are &ldquo;running [-Linux&rdquo;,-]
+# | {+Linux,&rdquo;+} which is like saying you are &ldquo;driving your
+# | carburetor&rdquo; or &ldquo;driving your [-transmission&rdquo;.-]
+# | {+transmission.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Most people have never heard of GNU.  Even most of the people who use the "
+#| "GNU system have never heard of GNU, since so many people and companies "
+#| "teach them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say "
+#| "they are &ldquo;running Linux&rdquo;, which is like saying you are &ldquo;"
+#| "driving your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
 msgid ""
 "Most people have never heard of GNU.  Even most of the people who use the "
 "GNU system have never heard of GNU, since so many people and companies teach "
-"them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say they are "
-"&ldquo;running Linux&rdquo;, which is like saying you are &ldquo;driving "
-"your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
+"them to call it &ldquo;Linux.&rdquo; Indeed, GNU users often say they are "
+"&ldquo;running Linux,&rdquo; which is like saying you are &ldquo;driving "
+"your carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;"
 msgstr ""
 "La mayoría de la gente nunca ha oído hablar de GNU. Incluso la mayoría de "
 "los que utilizan el sistema GNU nunca han oído hablar de GNU, debido a la "
@@ -68,7 +70,7 @@
 "sistema de transmisión»."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonetheless, those who know about GNU associate it with the ideals of "
 "freedom of the free software movement.  That association is no accident; the "
@@ -81,7 +83,7 @@
 "utilizar un ordenador y tener libertad."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "A person seeing the name &ldquo;GNU&rdquo; for the first time in &ldquo;GNU/"
 "Linux&rdquo; won't immediately know what it represents, but has come one "
@@ -100,7 +102,7 @@
 "encontrarán las ideas que GNU defiende."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If they don't search, they may encounter them anyway.  The <a href=\"/"
 "philosophy/open-source-misses-the-point.html\">&ldquo;open source&rdquo;</a> "
@@ -122,14 +124,30 @@
 "GNU."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of
+# | the ideals of freedom for which we developed the GNU system.  It is also
+# | useful as a reminder for people in our community who know about these
+# | ideals, in a world where much of discussion of free software takes a
+# | totally practical (and thus amoral) approach.  When we ask you to call the
+# | system [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} we are
+# | asking you to help in making the public aware of the free software ideals.
+#, fuzzy
+#| msgid ""
+#| "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness "
+#| "of the ideals of freedom for which we developed the GNU system.  It is "
+#| "also useful as a reminder for people in our community who know about "
+#| "these ideals, in a world where much of discussion of free software takes "
+#| "a totally practical (and thus amoral) approach.  When we ask you to call "
+#| "the system &ldquo;GNU/Linux&rdquo;, we are asking you to help in making "
+#| "the public aware of the free software ideals."
 msgid ""
 "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of "
 "the ideals of freedom for which we developed the GNU system.  It is also "
 "useful as a reminder for people in our community who know about these "
 "ideals, in a world where much of discussion of free software takes a totally "
 "practical (and thus amoral) approach.  When we ask you to call the system "
-"&ldquo;GNU/Linux&rdquo;, we are asking you to help in making the public "
+"&ldquo;GNU/Linux,&rdquo; we are asking you to help in making the public "
 "aware of the free software ideals."
 msgstr ""
 "Con el tiempo, al llamar al sistema «GNU/Linux» la gente se va 
concienciando "
@@ -141,6 +159,30 @@
 "Linux», lo que le estamos pidiendo es que contribuya a que la gente sea "
 "consciente de los ideales del software libre."
 
+# type: Content of: <div><blockquote><p>
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>.-]
+# | {+System</a>.+}
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
+#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-"
+#| "gnu.html\">Linux and the GNU Project</a>."
+msgid ""
+"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
+"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>."
+msgstr ""
+"Para saber más sobre este tema, puede leer también las <a href=\"/gnu/gnu-"
+"linux-faq.es.html\">preguntas más frecuentes acerca GNU/Linux</a>, además 
de "
+"nuestras paginas «<a href=\"/gnu/why-gnu-linux.es.html\">¿Por qué 
GNU/Linux?"
+"</a>» y <a href=\"/gnu/linux-and-gnu.es.html\">Linux y el proyecto GNU</a>."
+
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -187,14 +229,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; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
+# | Copyright &copy; [-2014,-] {+2006,+} 2015, [-2016-] {+2021+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -217,3 +258,11 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Última actualización:"
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."

Index: gnu/po/gnu-users-never-heard-of-gnu.fa-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.fa-diff.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gnu/po/gnu-users-never-heard-of-gnu.fa-diff.html    7 Apr 2021 18:04:00 
-0000       1.7
+++ gnu/po/gnu-users-never-heard-of-gnu.fa-diff.html    30 Aug 2021 13:34:53 
-0000      1.8
@@ -10,41 +10,36 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;GNU Users Who Have Never Heard of GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/gnu/po/gnu-users-never-heard-of-gnu.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;GNU</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;GNU</em></ins></span> 
Users Who Have Never Heard <span class="removed"><del><strong>of GNU&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;GNU Users Who Have Never Heard <span class="removed"><del><strong>of 
GNU&lt;/h2&gt;
 
-&lt;p&gt;&lt;strong&gt;by</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU&lt;/h2&gt;
+&lt;p&gt;&lt;strong&gt;by &lt;a href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
-&lt;address class="byline c"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
-<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;
-
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;To</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;To</em></ins></span> learn more about 
this issue, you can also read
+  &lt;blockquote&gt;&lt;p&gt;To learn more about this issue, you can also read
 our &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;, our page 
on 
 &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt; 
-and our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
Project&lt;/a&gt;.
-<span 
class="removed"><del><strong>&lt;/p&gt;&lt;/blockquote&gt;</strong></del></span>
-<span class="inserted"><ins><em>&lt;/p&gt;</em></ins></span>
-&lt;/div&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;
+and our page on</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU&lt;/h2&gt;
+
+&lt;address class="byline"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="/gnu/linux-and-gnu.html"&gt;Linux and the 
GNU Project&lt;/a&gt;.
+&lt;/p&gt;&lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;Most people have never heard of GNU.  Even most of the people who
 use the GNU system have never heard of GNU, <span 
class="removed"><del><strong>thanks to</strong></del></span> <span 
class="inserted"><ins><em>since</em></ins></span> so many people and
-companies <span class="removed"><del><strong>who</strong></del></span> teach 
them to call it &ldquo;Linux&rdquo;.  <span 
class="removed"><del><strong>Nonetheless,
-the name</strong></del></span>  <span 
class="inserted"><ins><em>Indeed,</em></ins></span> GNU <span 
class="removed"><del><strong>has certain associations, which people will 
discover once</strong></del></span>
-<span class="inserted"><ins><em>users often say</em></ins></span> they <span 
class="removed"><del><strong>hear the name.  GNU</strong></del></span> <span 
class="inserted"><ins><em>are &ldquo;running Linux&rdquo;, 
which</em></ins></span> is <span 
class="removed"><del><strong>associated</strong></del></span> <span 
class="inserted"><ins><em>like
+companies <span class="removed"><del><strong>who</strong></del></span> teach 
them to call it <span class="removed"><del><strong>&ldquo;Linux&rdquo;.  
Nonetheless,
+the name</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;  Indeed,</em></ins></span> GNU 
<span class="removed"><del><strong>has certain associations, which people will 
discover once</strong></del></span>
+<span class="inserted"><ins><em>users often say</em></ins></span> they <span 
class="removed"><del><strong>hear the name.  GNU</strong></del></span> <span 
class="inserted"><ins><em>are &ldquo;running Linux,&rdquo; 
which</em></ins></span> is <span 
class="removed"><del><strong>associated</strong></del></span> <span 
class="inserted"><ins><em>like
 saying you are &ldquo;driving your carburetor&rdquo; or
-&ldquo;driving your transmission&rdquo;.&lt;/p&gt;
+&ldquo;driving your transmission.&rdquo;&lt;/p&gt;
 
 &lt;p&gt;Nonetheless, those who know about GNU associate it</em></ins></span> 
with the ideals
 of freedom of the free software movement.  That association is no
@@ -64,9 +59,9 @@
 href="http://www.gnu.org"&gt;www.gnu.org&lt;/a&gt;, which talks about free
 software and freedom.&lt;/p&gt;
 
-&lt;p&gt;A person seeing the name &ldquo;GNU&rdquo; for</strong></del></span> 
the <span class="removed"><del><strong>first time in
+&lt;p&gt;A person seeing the name &ldquo;GNU&rdquo; for the first time in
 &ldquo;GNU/Linux&rdquo; won't immediately associate it with anything.
-However, when people know that the system is basically GNU, that brings
+However, when people know that</strong></del></span> the <span 
class="removed"><del><strong>system is basically GNU, that brings
 them a step closer to learning about our ideals.  For instance, they
 might become curious and look for more information about 
GNU.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>ideas GNU 
stands for.&lt;/p&gt;</em></ins></span>
 
@@ -86,10 +81,19 @@
 system.  It is also useful as a reminder for people in our community
 who know about these ideals, in a world where much of discussion of
 free software takes a totally practical (and thus amoral) approach.
-When we ask you to call the system &ldquo;GNU/Linux&rdquo;, we <span 
class="removed"><del><strong>do so because
+When we ask you to call the system <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> we 
<span class="removed"><del><strong>do so because
 awareness of GNU slowly but surely brings with it 
awareness</strong></del></span> <span class="inserted"><ins><em>are
-asking you to help in making the public aware</em></ins></span> of the free 
software <span class="removed"><del><strong>ideals of freedom and 
community.&lt;/p&gt;</strong></del></span>
+asking you to help in making the public aware</em></ins></span> of the free 
software <span class="removed"><del><strong>ideals of 
freedom</strong></del></span>
 <span class="inserted"><ins><em>ideals.&lt;/p&gt;
+
+&lt;div class="announcement comment" role="complementary"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;p&gt;To learn more about this issue, you can also read
+our &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;, our page 
on 
+&lt;a href="/gnu/why-gnu-linux.html"&gt;Why 
GNU/Linux?&lt;/a&gt;</em></ins></span> 
+and <span 
class="removed"><del><strong>community.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>our page on &lt;a 
href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU System&lt;/a&gt;.
+&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
 &lt;/div&gt;
 &lt;/div&gt;</em></ins></span>
 
@@ -140,7 +144,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2006, 2007, <span class="removed"><del><strong>2013, 
2014</strong></del></span> <span class="inserted"><ins><em>2013-2015, 2017, 
2019, 2021</em></ins></span> Free Software
+&lt;p&gt;Copyright &copy; 2006, <span class="removed"><del><strong>2007, 2013, 
2014</strong></del></span> <span class="inserted"><ins><em>2015, 
2021</em></ins></span> Free Software
 Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
@@ -152,11 +156,12 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/04/07 18:04:00 $
+$Date: 2021/08/30 13:34:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-&lt;/div&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for class="inner", starts 
in the banner include --&gt;</em></ins></span>
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>

Index: gnu/po/gnu-users-never-heard-of-gnu.fa.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.fa.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- gnu/po/gnu-users-never-heard-of-gnu.fa.po   7 Apr 2021 18:04:00 -0000       
1.24
+++ gnu/po/gnu-users-never-heard-of-gnu.fa.po   30 Aug 2021 13:34:53 -0000      
1.25
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2009-05-21 15:15+0330\n"
 "Last-Translator: Abbas Esmaeeli Some'eh <abbas@gnu.org>\n"
 "Language-Team: Persian <www-fa-general@list.gnu.org>\n"
@@ -25,32 +25,20 @@
 "کاربران گنو که هرگز چیزی درباره گنو 
نشنیده‌اند - پروژه گنو - بنیاد "
 "نرم‌افزارهای آزاد"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 #, fuzzy
 #| msgid "GNU Users Who Have Never Heard of GNU"
 msgid "GNU Users Who Have Never Heard of&nbsp;GNU"
 msgstr "کاربران گنو که هرگز چیزی درباره گنو 
نشنیده‌اند"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 #, fuzzy
 #| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "نوشتهٔ <a href=\"http://www.stallman.org/\";>ریچارد 
استالمن</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
-"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>."
-msgstr ""
-"برای اطلاعات بیشتر در این زمینه می‌توانید 
<a href=\"/gnu/gnu-linux-faq.html"
-"\">سوالات متداول درباره گنو/لینوکس</a>، <a 
href=\"/gnu/why-gnu-linux.html"
-"\">چرا گنو/لینوکس؟</a> و <a 
href=\"/gnu/linux-and-gnu.html\">لینوکس و پروژه "
-"گنو</a> را نیز مطالعه کنید."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "Most people have never heard of GNU.  Even most of the people who use the "
@@ -64,9 +52,9 @@
 msgid ""
 "Most people have never heard of GNU.  Even most of the people who use the "
 "GNU system have never heard of GNU, since so many people and companies teach "
-"them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say they are "
-"&ldquo;running Linux&rdquo;, which is like saying you are &ldquo;driving "
-"your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
+"them to call it &ldquo;Linux.&rdquo; Indeed, GNU users often say they are "
+"&ldquo;running Linux,&rdquo; which is like saying you are &ldquo;driving "
+"your carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;"
 msgstr ""
 "اغلب مردم هرگز چیزی دربارهٔ گنو 
نشنیده‌اند. با تشکر از بسیاری از اشخاص و "
 "شرکت‌ها که سیستم گنو را &rdquo;لینوکس&ldquo; م
ی‌خوانند، اغلب افرادی که از "
@@ -76,7 +64,7 @@
 "نیست؛ انگیزهٔ توسعهٔ گنو به طور مشخص این 
بود که بتوان از یک کامپیوتر استفاده "
 "کرد و در عین حال آزادی نیز داشت."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "Most people have never heard of GNU.  Even most of the people who use the "
@@ -101,7 +89,7 @@
 "نیست؛ انگیزهٔ توسعهٔ گنو به طور مشخص این 
بود که بتوان از یک کامپیوتر استفاده "
 "کرد و در عین حال آزادی نیز داشت."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "The association between the name GNU and our goals of freedom and social "
@@ -125,7 +113,7 @@
 "کنند، <a href=\"http://www.gnu.org\";>www.gnu.org</a> را خواهند 
یافت که "
 "دربارهٔ نرم‌افزار آزاد و آزادی سخن م
ی‌گوید."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "If they don't look for it, they may encounter it anyway.  The &ldquo;open "
@@ -152,7 +140,7 @@
 "حال استفاده از سیستم گنو است، تمایل بیشتری 
دارد تا اطلاعاتی دربارهٔ گنو "
 "(همانند اینکه گنو در حال مبارزه برای آزادی 
و جامعه است) بدست آورد."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness "
@@ -169,7 +157,7 @@
 "useful as a reminder for people in our community who know about these "
 "ideals, in a world where much of discussion of free software takes a totally "
 "practical (and thus amoral) approach.  When we ask you to call the system "
-"&ldquo;GNU/Linux&rdquo;, we are asking you to help in making the public "
+"&ldquo;GNU/Linux,&rdquo; we are asking you to help in making the public "
 "aware of the free software ideals."
 msgstr ""
 "در طولانی مدت، اشاره به سیستم با نام 
&rdquo;گنو/لینوکس&ldquo; آگاهی دربارهٔ "
@@ -181,6 +169,24 @@
 "لینوکس&ldquo; بخوانید، چرا که اطلاع دربارهٔ 
گنو به آرامی اما مطمئنا موجب "
 "اطلاع از ایده‌آل‌های آزادی و جامعه م
ی‌شود."
 
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
+#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-"
+#| "gnu.html\">Linux and the GNU Project</a>."
+msgid ""
+"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
+"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>."
+msgstr ""
+"برای اطلاعات بیشتر در این زمینه می‌توانید 
<a href=\"/gnu/gnu-linux-faq.html"
+"\">سوالات متداول درباره گنو/لینوکس</a>، <a 
href=\"/gnu/why-gnu-linux.html"
+"\">چرا گنو/لینوکس؟</a> و <a 
href=\"/gnu/linux-and-gnu.html\">لینوکس و پروژه "
+"گنو</a> را نیز مطالعه کنید."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -226,16 +232,12 @@
 "لطفا برای اطلاعات بیشتر جهت هماهنگی و 
ارسال ترجمه‌های این مقاله صفحه <a href="
 "\"/server/standards/README.translations.html\">راهنمای ترجم
ه‌ها</a> را ببینید."
 
+# type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
-#| msgid ""
-#| "Copyright &copy; 2006, 2007, 2013, 2014 Free Software Foundation, Inc."
-msgid ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"<span dir=\"ltr\">Copyright &copy; 2006, 2007, 2013, 2014 Free Software "
-"Foundation, Inc.</span>"
+#| msgid "Copyright &copy; 2010 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2010 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 #, fuzzy
@@ -262,6 +264,16 @@
 msgid "Updated:"
 msgstr "آخرین به روز رسانی:"
 
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 2006, 2007, 2013, 2014 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "<span dir=\"ltr\">Copyright &copy; 2006, 2007, 2013, 2014 Free Software "
+#~ "Foundation, Inc.</span>"
+
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"

Index: gnu/po/gnu-users-never-heard-of-gnu.fr.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.fr.po,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- gnu/po/gnu-users-never-heard-of-gnu.fr.po   4 Jul 2021 18:22:45 -0000       
1.46
+++ gnu/po/gnu-users-never-heard-of-gnu.fr.po   30 Aug 2021 13:34:53 -0000      
1.47
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-07-04 20:19+0200\n"
 "Last-Translator: Sogal <sogal AT member.fsf.org>\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-08-30 13:26+0000\n"
 "Plural-Forms: \n"
 
 #. type: Content of: <title>
@@ -26,33 +27,35 @@
 "Les utilisateurs de GNU qui n'ont jamais entendu parler de GNU - Projet GNU "
 "- Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU Users Who Have Never Heard of&nbsp;GNU"
 msgstr "Les utilisateurs de GNU qui n'ont jamais entendu parler de GNU"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "par <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
-"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>."
-msgstr ""
-"Pour en apprendre plus sur ce problème, vous pouvez aussi lire notre <a 
href="
-"\"/gnu/gnu-linux-faq.html\">FAQ GNU/Linux</a>, notre page sur <a href=\"/gnu/"
-"why-gnu-linux.html\">Pourquoi GNU/Linux ?</a> et notre page sur <a href=\"/"
-"gnu/linux-and-gnu.html\">Linux et le projet GNU</a>."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Most people have never heard of GNU.  Even most of the people who use the
+# | GNU system have never heard of GNU, since so many people and companies
+# | teach them to call it [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+# | Indeed, GNU users often say they are &ldquo;running [-Linux&rdquo;,-]
+# | {+Linux,&rdquo;+} which is like saying you are &ldquo;driving your
+# | carburetor&rdquo; or &ldquo;driving your [-transmission&rdquo;.-]
+# | {+transmission.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Most people have never heard of GNU.  Even most of the people who use the "
+#| "GNU system have never heard of GNU, since so many people and companies "
+#| "teach them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say "
+#| "they are &ldquo;running Linux&rdquo;, which is like saying you are &ldquo;"
+#| "driving your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
 msgid ""
 "Most people have never heard of GNU.  Even most of the people who use the "
 "GNU system have never heard of GNU, since so many people and companies teach "
-"them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say they are "
-"&ldquo;running Linux&rdquo;, which is like saying you are &ldquo;driving "
-"your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
+"them to call it &ldquo;Linux.&rdquo; Indeed, GNU users often say they are "
+"&ldquo;running Linux,&rdquo; which is like saying you are &ldquo;driving "
+"your carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;"
 msgstr ""
 "La plupart des gens n'ont jamais entendu parler de GNU. Qui plus est, la "
 "plupart des utilisateurs du système GNU n'en ont jamais entendu parler, dans 
"
@@ -61,7 +64,7 @@
 "« font tourner Linux », ce qui est comme de dire que vous « conduisez 
votre "
 "carburateur » ou que vous « conduisez votre transmission »."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonetheless, those who know about GNU associate it with the ideals of "
 "freedom of the free software movement.  That association is no accident; the "
@@ -73,7 +76,7 @@
 "hasard : GNU a été développé spécifiquement pour rendre possible "
 "l'utilisation d'un ordinateur en toute liberté."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "A person seeing the name &ldquo;GNU&rdquo; for the first time in &ldquo;GNU/"
 "Linux&rdquo; won't immediately know what it represents, but has come one "
@@ -92,7 +95,7 @@
 "ces utilisateurs font une recherche sur GNU, ils trouveront les idées que "
 "GNU défend."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If they don't search, they may encounter them anyway.  The <a href=\"/"
 "philosophy/open-source-misses-the-point.html\">&ldquo;open source&rdquo;</a> "
@@ -113,14 +116,30 @@
 "liberté et la communauté) s'ils savent qu'ils sont utilisateurs du système 
"
 "GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of
+# | the ideals of freedom for which we developed the GNU system.  It is also
+# | useful as a reminder for people in our community who know about these
+# | ideals, in a world where much of discussion of free software takes a
+# | totally practical (and thus amoral) approach.  When we ask you to call the
+# | system [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} we are
+# | asking you to help in making the public aware of the free software ideals.
+#, fuzzy
+#| msgid ""
+#| "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness "
+#| "of the ideals of freedom for which we developed the GNU system.  It is "
+#| "also useful as a reminder for people in our community who know about "
+#| "these ideals, in a world where much of discussion of free software takes "
+#| "a totally practical (and thus amoral) approach.  When we ask you to call "
+#| "the system &ldquo;GNU/Linux&rdquo;, we are asking you to help in making "
+#| "the public aware of the free software ideals."
 msgid ""
 "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of "
 "the ideals of freedom for which we developed the GNU system.  It is also "
 "useful as a reminder for people in our community who know about these "
 "ideals, in a world where much of discussion of free software takes a totally "
 "practical (and thus amoral) approach.  When we ask you to call the system "
-"&ldquo;GNU/Linux&rdquo;, we are asking you to help in making the public "
+"&ldquo;GNU/Linux,&rdquo; we are asking you to help in making the public "
 "aware of the free software ideals."
 msgstr ""
 "Avec le temps, appeler le système « GNU/Linux » sensibilisera les gens 
aux "
@@ -131,6 +150,29 @@
 "vous demandons d'appeler le système « GNU/Linux », nous vous demandons "
 "d'aider à rendre le public conscient des idéaux du logiciel libre."
 
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>.-]
+# | {+System</a>.+}
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
+#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-"
+#| "gnu.html\">Linux and the GNU Project</a>."
+msgid ""
+"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
+"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>."
+msgstr ""
+"Pour en apprendre plus sur ce problème, vous pouvez aussi lire notre <a 
href="
+"\"/gnu/gnu-linux-faq.html\">FAQ GNU/Linux</a>, notre page sur <a href=\"/gnu/"
+"why-gnu-linux.html\">Pourquoi GNU/Linux ?</a> et notre page sur <a href=\"/"
+"gnu/linux-and-gnu.html\">Linux et le projet GNU</a>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -175,12 +217,12 @@
 "traduction</a> les infos nécessaires."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
+# | Copyright &copy; [-2014,-] {+2006,+} 2015, [-2016-] {+2021+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -204,3 +246,10 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
+
+#~ msgid ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."

Index: gnu/po/gnu-users-never-heard-of-gnu.hr-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.hr-diff.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gnu/po/gnu-users-never-heard-of-gnu.hr-diff.html    30 May 2021 19:32:26 
-0000      1.9
+++ gnu/po/gnu-users-never-heard-of-gnu.hr-diff.html    30 Aug 2021 13:34:53 
-0000      1.10
@@ -10,41 +10,36 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.76</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.76</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;GNU Users Who Have Never Heard of GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/gnu/po/gnu-users-never-heard-of-gnu.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;GNU</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;GNU</em></ins></span> 
Users Who Have Never Heard <span class="removed"><del><strong>of GNU&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;GNU Users Who Have Never Heard <span class="removed"><del><strong>of 
GNU&lt;/h2&gt;
 
-&lt;p&gt;&lt;strong&gt;by</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU&lt;/h2&gt;
+&lt;p&gt;&lt;strong&gt;by &lt;a href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
-&lt;address class="byline c"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
-<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;
-
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;To</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;To</em></ins></span> learn more about 
this issue, you can also read
+  &lt;blockquote&gt;&lt;p&gt;To learn more about this issue, you can also read
 our &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;, our page 
on 
 &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt; 
-and our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
Project&lt;/a&gt;.
-<span 
class="removed"><del><strong>&lt;/p&gt;&lt;/blockquote&gt;</strong></del></span>
-<span class="inserted"><ins><em>&lt;/p&gt;</em></ins></span>
-&lt;/div&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;
+and our page on</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU&lt;/h2&gt;
+
+&lt;address class="byline"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="/gnu/linux-and-gnu.html"&gt;Linux and the 
GNU Project&lt;/a&gt;.
+&lt;/p&gt;&lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;Most people have never heard of GNU.  Even most of the people who
 use the GNU system have never heard of GNU, <span 
class="removed"><del><strong>thanks to</strong></del></span> <span 
class="inserted"><ins><em>since</em></ins></span> so many people and
-companies <span class="removed"><del><strong>who</strong></del></span> teach 
them to call it &ldquo;Linux&rdquo;.  <span 
class="removed"><del><strong>Nonetheless,
-the name</strong></del></span>  <span 
class="inserted"><ins><em>Indeed,</em></ins></span> GNU <span 
class="removed"><del><strong>has certain associations, which people will 
discover once</strong></del></span>
-<span class="inserted"><ins><em>users often say</em></ins></span> they <span 
class="removed"><del><strong>hear the name.  GNU</strong></del></span> <span 
class="inserted"><ins><em>are &ldquo;running Linux&rdquo;, 
which</em></ins></span> is <span 
class="removed"><del><strong>associated</strong></del></span> <span 
class="inserted"><ins><em>like
+companies <span class="removed"><del><strong>who</strong></del></span> teach 
them to call it <span class="removed"><del><strong>&ldquo;Linux&rdquo;.  
Nonetheless,
+the name</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;  Indeed,</em></ins></span> GNU 
<span class="removed"><del><strong>has certain associations, which people will 
discover once</strong></del></span>
+<span class="inserted"><ins><em>users often say</em></ins></span> they <span 
class="removed"><del><strong>hear the name.  GNU</strong></del></span> <span 
class="inserted"><ins><em>are &ldquo;running Linux,&rdquo; 
which</em></ins></span> is <span 
class="removed"><del><strong>associated</strong></del></span> <span 
class="inserted"><ins><em>like
 saying you are &ldquo;driving your carburetor&rdquo; or
-&ldquo;driving your transmission&rdquo;.&lt;/p&gt;
+&ldquo;driving your transmission.&rdquo;&lt;/p&gt;
 
 &lt;p&gt;Nonetheless, those who know about GNU associate it</em></ins></span> 
with the ideals
 of freedom of the free software movement.  That association is no
@@ -64,9 +59,9 @@
 href="http://www.gnu.org"&gt;www.gnu.org&lt;/a&gt;, which talks about free
 software and freedom.&lt;/p&gt;
 
-&lt;p&gt;A person seeing the name &ldquo;GNU&rdquo; for</strong></del></span> 
the <span class="removed"><del><strong>first time in
+&lt;p&gt;A person seeing the name &ldquo;GNU&rdquo; for the first time in
 &ldquo;GNU/Linux&rdquo; won't immediately associate it with anything.
-However, when people know that the system is basically GNU, that brings
+However, when people know that</strong></del></span> the <span 
class="removed"><del><strong>system is basically GNU, that brings
 them a step closer to learning about our ideals.  For instance, they
 might become curious and look for more information about 
GNU.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>ideas GNU 
stands for.&lt;/p&gt;</em></ins></span>
 
@@ -86,10 +81,19 @@
 system.  It is also useful as a reminder for people in our community
 who know about these ideals, in a world where much of discussion of
 free software takes a totally practical (and thus amoral) approach.
-When we ask you to call the system &ldquo;GNU/Linux&rdquo;, we <span 
class="removed"><del><strong>do so because
+When we ask you to call the system <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> we 
<span class="removed"><del><strong>do so because
 awareness of GNU slowly but surely brings with it 
awareness</strong></del></span> <span class="inserted"><ins><em>are
-asking you to help in making the public aware</em></ins></span> of the free 
software <span class="removed"><del><strong>ideals of freedom and 
community.&lt;/p&gt;</strong></del></span>
+asking you to help in making the public aware</em></ins></span> of the free 
software <span class="removed"><del><strong>ideals of 
freedom</strong></del></span>
 <span class="inserted"><ins><em>ideals.&lt;/p&gt;
+
+&lt;div class="announcement comment" role="complementary"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;p&gt;To learn more about this issue, you can also read
+our &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;, our page 
on 
+&lt;a href="/gnu/why-gnu-linux.html"&gt;Why 
GNU/Linux?&lt;/a&gt;</em></ins></span> 
+and <span 
class="removed"><del><strong>community.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>our page on &lt;a 
href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU System&lt;/a&gt;.
+&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
 &lt;/div&gt;
 &lt;/div&gt;</em></ins></span>
 
@@ -140,7 +144,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2006, 2007, <span 
class="removed"><del><strong>2013</strong></del></span> <span 
class="inserted"><ins><em>2013-2015, 2017, 2019, 2021</em></ins></span> Free 
Software
+&lt;p&gt;Copyright &copy; 2006, <span class="removed"><del><strong>2007, 
2013</strong></del></span> <span class="inserted"><ins><em>2015, 
2021</em></ins></span> Free Software
 Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
@@ -154,11 +158,12 @@
 
 <span class="inserted"><ins><em>&lt;p</em></ins></span> 
class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/30 19:32:26 $
+$Date: 2021/08/30 13:34:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-&lt;/div&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for class="inner", starts 
in the banner include --&gt;</em></ins></span>
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>

Index: gnu/po/gnu-users-never-heard-of-gnu.hr.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.hr.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gnu/po/gnu-users-never-heard-of-gnu.hr.po   30 May 2021 19:32:26 -0000      
1.14
+++ gnu/po/gnu-users-never-heard-of-gnu.hr.po   30 Aug 2021 13:34:53 -0000      
1.15
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2013-06-03 18:30+0100\n"
 "Last-Translator: Martina Bebek <martinaporec@gmail.com>\n"
 "Language-Team: GNU Croatian Translation Team <www-hr-lista@gnu.org>\n"
@@ -27,14 +27,14 @@
 "Korisnici GNU-a koji nisu nikada čuli za GNU - Projekt GNU - Zaklada za "
 "slobodan softver"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 # | GNU Users Who Have Never Heard [-of GNU-] {+of&nbsp;GNU+}
 #, fuzzy
 #| msgid "GNU Users Who Have Never Heard of GNU"
 msgid "GNU Users Who Have Never Heard of&nbsp;GNU"
 msgstr "Korisnici GNU-a koji nisu nikada čuli za GNU"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 # | by <a [-href=\"http://www.stallman.org/\";><strong>Richard
 # | Stallman</strong></a>-] {+href=\"https://www.stallman.org/\";>Richard
 # | Stallman</a>+}
@@ -46,30 +46,18 @@
 msgstr ""
 "<a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
-"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>."
-msgstr ""
-"Ukoliko želite saznati više o ovoj temi, možete pročitati naša <a 
href=\"/"
-"gnu/gnu-linux-faq.html\">ČPP o temi GNU/Linux </a>, našu stranicu <a 
href=\"/"
-"gnu/why-gnu-linux.html\">Zašto GNU/Linux?</a> i našu stranicu <a 
href=\"/gnu/"
-"linux-and-gnu.html\">Linux i projekt GNU</a>."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Most people have never heard of GNU.  Even most of the people who use the
 # | GNU system have never heard of GNU, [-thanks to-] {+since+} so many people
-# | and companies [-who-] teach them to call it &ldquo;Linux&rdquo;. 
-# | [-Nonetheless, the name-]  {+Indeed,+} GNU [-has certain associations,
-# | which people will discover once-] {+users often say+} they [-hear the
-# | name.  GNU is associated with the ideals of freedom of the free software
-# | movement.  That association-] {+are &ldquo;running Linux&rdquo;, which+}
-# | is [-no accident; the motive for developing GNU was specifically to make
-# | it possible to use a computer and have freedom.-] {+like saying you are
-# | &ldquo;driving your carburetor&rdquo; or &ldquo;driving your
-# | transmission&rdquo;.+}
+# | and companies [-who-] teach them to call it [-&ldquo;Linux&rdquo;. 
+# | Nonetheless, the name-] {+&ldquo;Linux.&rdquo; Indeed,+} GNU [-has certain
+# | associations, which people will discover once-] {+users often say+} they
+# | [-hear the name.  GNU is associated with the ideals of freedom of the free
+# | software movement.  That association-] {+are &ldquo;running Linux,&rdquo;
+# | which+} is [-no accident; the motive for developing GNU was specifically
+# | to make it possible to use a computer and have freedom.-] {+like saying
+# | you are &ldquo;driving your carburetor&rdquo; or &ldquo;driving your
+# | transmission.&rdquo;+}
 #, fuzzy
 #| msgid ""
 #| "Most people have never heard of GNU.  Even most of the people who use the "
@@ -83,9 +71,9 @@
 msgid ""
 "Most people have never heard of GNU.  Even most of the people who use the "
 "GNU system have never heard of GNU, since so many people and companies teach "
-"them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say they are "
-"&ldquo;running Linux&rdquo;, which is like saying you are &ldquo;driving "
-"your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
+"them to call it &ldquo;Linux.&rdquo; Indeed, GNU users often say they are "
+"&ldquo;running Linux,&rdquo; which is like saying you are &ldquo;driving "
+"your carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;"
 msgstr ""
 "Mnogi nisu nikada čuli za GNU, a zahvaljujući pojedincima i tvrtkama koje 
ih "
 "uče nazivu &ldquo;Linux&rdquo;, za GNU nije čula ni velika većina onih 
koji "
@@ -94,7 +82,7 @@
 "softvera, i te veze nisu puka slučajnost; motiv za razvoj GNU-a je bio "
 "omogućavanje korištenja računala uz zadržavanje slobode."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | [-Most people have never heard of GNU.  Even most of the
 # | people-]{+Nonetheless, those+} who [-use the-] {+know about+} GNU [-system
 # | have never heard of GNU, thanks to so many people and companies who teach
@@ -127,7 +115,7 @@
 "softvera, i te veze nisu puka slučajnost; motiv za razvoj GNU-a je bio "
 "omogućavanje korištenja računala uz zadržavanje slobode."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | A person seeing the name &ldquo;GNU&rdquo; for the first time in
 # | &ldquo;GNU/Linux&rdquo; won't immediately [-associate it with anything. 
 # | However, when people-] know [-that the system is basically GNU, that
@@ -176,7 +164,7 @@
 "tih korisnika traže GNU, naći će <a 
href=\"http://www.gnu.org\";>www.gnu.org</"
 "a>, koji govori o slobodnom softveru i slobodi."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | If they don't [-look for it,-] {+search,+} they may encounter [-it-]
 # | {+them+} anyway.  The [-&ldquo;open source&rdquo;-] {+<a
 # | href=\"/philosophy/open-source-misses-the-point.html\">&ldquo;open
@@ -214,16 +202,16 @@
 "informacije o GNU-u (kao Å¡to je npr. informacija da je GNU djelo kampanje za 
"
 "slobodu i zajednicu) ."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of
 # | the ideals of freedom for which we developed the GNU system.  It is also
 # | useful as a reminder for people in our community who know about these
 # | ideals, in a world where much of discussion of free software takes a
 # | totally practical (and thus amoral) approach.  When we ask you to call the
-# | system &ldquo;GNU/Linux&rdquo;, we [-do so because awareness of GNU slowly
-# | but surely brings with it awareness-] {+are asking you to help in making
-# | the public aware+} of the free software [-ideals of freedom and
-# | community.-] {+ideals.+}
+# | system [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} we [-do
+# | so because awareness of GNU slowly but surely brings with it awareness-]
+# | {+are asking you to help in making the public aware+} of the free software
+# | [-ideals of freedom and community.-] {+ideals.+}
 #, fuzzy
 #| msgid ""
 #| "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness "
@@ -240,7 +228,7 @@
 "useful as a reminder for people in our community who know about these "
 "ideals, in a world where much of discussion of free software takes a totally "
 "practical (and thus amoral) approach.  When we ask you to call the system "
-"&ldquo;GNU/Linux&rdquo;, we are asking you to help in making the public "
+"&ldquo;GNU/Linux,&rdquo; we are asking you to help in making the public "
 "aware of the free software ideals."
 msgstr ""
 "S vremenom, nazivanje sustava &ldquo;GNU/Linuxom&rdquo; Å¡iri svijest o "
@@ -251,6 +239,29 @@
 "&ldquo;GNU/Linux&rdquo;, činimo to jer svijest o GNU-u, polako ali sigurno, "
 "uz sebe nosi i svijest o idealima slobode i zajednice u slobodnom softveru."
 
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>.-]
+# | {+System</a>.+}
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
+#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-"
+#| "gnu.html\">Linux and the GNU Project</a>."
+msgid ""
+"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
+"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>."
+msgstr ""
+"Ukoliko želite saznati više o ovoj temi, možete pročitati naša <a 
href=\"/"
+"gnu/gnu-linux-faq.html\">ČPP o temi GNU/Linux </a>, našu stranicu <a 
href=\"/"
+"gnu/why-gnu-linux.html\">Zašto GNU/Linux?</a> i našu stranicu <a 
href=\"/gnu/"
+"linux-and-gnu.html\">Linux i projekt GNU</a>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -302,14 +313,12 @@
 "prijevode</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2006, 2007, [-2013-] {+2013-2015, 2017, 2019, 2021+} Free
-# | Software Foundation, Inc.
+# | Copyright &copy; [-2010, 2013-] {+2006, 2015, 2021+} Free Software
+# | Foundation, Inc.
 #, fuzzy
-#| msgid "Copyright &copy; 2006, 2007, 2013 Free Software Foundation, Inc."
-msgid ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
-msgstr "Copyright &copy; 2006, 2007, 2013 Free Software Foundation, Inc."
+#| msgid "Copyright &copy; 2010, 2013 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2010, 2013 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -331,6 +340,13 @@
 msgid "Updated:"
 msgstr "Zadnji put promijenjeno:"
 
+#, fuzzy
+#~| msgid "Copyright &copy; 2006, 2007, 2013 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr "Copyright &copy; 2006, 2007, 2013 Free Software Foundation, Inc."
+
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"

Index: gnu/po/gnu-users-never-heard-of-gnu.it.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.it.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- gnu/po/gnu-users-never-heard-of-gnu.it.po   7 Jun 2021 07:59:35 -0000       
1.23
+++ gnu/po/gnu-users-never-heard-of-gnu.it.po   30 Aug 2021 13:34:53 -0000      
1.24
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2019-04-18 22:09+0200\n"
 "Last-Translator: Andrea Pescetti <pescetti@gnu.org>\n"
 "Language-Team: Italian <www-it-traduzioni@gnu.org>\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "X-Generator: Poedit 2.0.3\n"
 
 #. type: Content of: <title>
@@ -26,33 +27,35 @@
 "Utenti GNU che non hanno mai sentito parlare di GNU - Progetto GNU - Free "
 "Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU Users Who Have Never Heard of&nbsp;GNU"
 msgstr "Utenti GNU che non hanno mai sentito parlare di&nbsp;GNU"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "di <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
-"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>."
-msgstr ""
-"Per saperne di più su questo tema, si consiglia di leggere le nostre <a 
href="
-"\"/gnu/gnu-linux-faq.html\">Domande Ricorrenti su GNU/Linux</a>, la nostra "
-"pagina <a href=\"/gnu/why-gnu-linux.html\">Perché GNU/Linux?</a> e la nostra 
"
-"pagina su <a href=\"/gnu/linux-and-gnu.html\">Linux ed il sistema GNU</a>."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Most people have never heard of GNU.  Even most of the people who use the
+# | GNU system have never heard of GNU, since so many people and companies
+# | teach them to call it [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+# | Indeed, GNU users often say they are &ldquo;running [-Linux&rdquo;,-]
+# | {+Linux,&rdquo;+} which is like saying you are &ldquo;driving your
+# | carburetor&rdquo; or &ldquo;driving your [-transmission&rdquo;.-]
+# | {+transmission.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Most people have never heard of GNU.  Even most of the people who use the "
+#| "GNU system have never heard of GNU, since so many people and companies "
+#| "teach them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say "
+#| "they are &ldquo;running Linux&rdquo;, which is like saying you are &ldquo;"
+#| "driving your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
 msgid ""
 "Most people have never heard of GNU.  Even most of the people who use the "
 "GNU system have never heard of GNU, since so many people and companies teach "
-"them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say they are "
-"&ldquo;running Linux&rdquo;, which is like saying you are &ldquo;driving "
-"your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
+"them to call it &ldquo;Linux.&rdquo; Indeed, GNU users often say they are "
+"&ldquo;running Linux,&rdquo; which is like saying you are &ldquo;driving "
+"your carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;"
 msgstr ""
 "La maggior parte della gente non ha mai sentito parlare di GNU. Persino la "
 "maggior parte della gente che usa il sistema GNU non ha mai sentito parlare "
@@ -61,7 +64,7 @@
 "&ldquo;usano Linux&rdquo;, che è come dire che un automobilista sta &ldquo;"
 "guidando il suo carburatore&rdquo; o &ldquo;guidando il suo serbatoio&rdquo;."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonetheless, those who know about GNU associate it with the ideals of "
 "freedom of the free software movement.  That association is no accident; the "
@@ -73,7 +76,7 @@
 "cui GNU è stato sviluppato era specificamente quello di rendere possibile "
 "l'uso di un computer in libertà. "
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "A person seeing the name &ldquo;GNU&rdquo; for the first time in &ldquo;GNU/"
 "Linux&rdquo; won't immediately know what it represents, but has come one "
@@ -91,7 +94,7 @@
 "href=\"/home.html\">gnu.org</a>  e su Wikipedia. Esiste sul web; se questi "
 "utenti cercano GNU, troveranno le idee che GNU difende."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If they don't search, they may encounter them anyway.  The <a href=\"/"
 "philosophy/open-source-misses-the-point.html\">&ldquo;open source&rdquo;</a> "
@@ -112,14 +115,30 @@
 "leggere attentamente le informazioni circa GNU (come il fatto che è il "
 "risultato di una campagna per libertà e comunità)."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of
+# | the ideals of freedom for which we developed the GNU system.  It is also
+# | useful as a reminder for people in our community who know about these
+# | ideals, in a world where much of discussion of free software takes a
+# | totally practical (and thus amoral) approach.  When we ask you to call the
+# | system [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} we are
+# | asking you to help in making the public aware of the free software ideals.
+#, fuzzy
+#| msgid ""
+#| "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness "
+#| "of the ideals of freedom for which we developed the GNU system.  It is "
+#| "also useful as a reminder for people in our community who know about "
+#| "these ideals, in a world where much of discussion of free software takes "
+#| "a totally practical (and thus amoral) approach.  When we ask you to call "
+#| "the system &ldquo;GNU/Linux&rdquo;, we are asking you to help in making "
+#| "the public aware of the free software ideals."
 msgid ""
 "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of "
 "the ideals of freedom for which we developed the GNU system.  It is also "
 "useful as a reminder for people in our community who know about these "
 "ideals, in a world where much of discussion of free software takes a totally "
 "practical (and thus amoral) approach.  When we ask you to call the system "
-"&ldquo;GNU/Linux&rdquo;, we are asking you to help in making the public "
+"&ldquo;GNU/Linux,&rdquo; we are asking you to help in making the public "
 "aware of the free software ideals."
 msgstr ""
 "Nel tempo, chiamare il sistema &ldquo;GNU/Linux&rdquo; diffonde coscienza "
@@ -130,6 +149,29 @@
 "chiediamo di chiamare il sistema  &ldquo;GNU/Linux&rdquo; vi chiediamo aiuto "
 "per rendere il pubblico più consapevole degli ideali del software libero."
 
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>.-]
+# | {+System</a>.+}
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
+#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-"
+#| "gnu.html\">Linux and the GNU Project</a>."
+msgid ""
+"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
+"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>."
+msgstr ""
+"Per saperne di più su questo tema, si consiglia di leggere le nostre <a 
href="
+"\"/gnu/gnu-linux-faq.html\">Domande Ricorrenti su GNU/Linux</a>, la nostra "
+"pagina <a href=\"/gnu/why-gnu-linux.html\">Perché GNU/Linux?</a> e la nostra 
"
+"pagina su <a href=\"/gnu/linux-and-gnu.html\">Linux ed il sistema GNU</a>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -177,12 +219,12 @@
 "traduzioni</a>."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
+# | Copyright &copy; [-2014,-] {+2006,+} 2015, [-2016-] {+2021+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -208,6 +250,13 @@
 msgstr "Ultimo aggiornamento:"
 
 #~ msgid ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+
+#~ msgid ""
 #~ "A person seeing the name &ldquo;GNU&rdquo; for the first time in &ldquo;"
 #~ "GNU/Linux&rdquo; won't immediately associate it with anything.  However, "
 #~ "when people know that the system is basically GNU, that brings them a "

Index: gnu/po/gnu-users-never-heard-of-gnu.ja.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.ja.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- gnu/po/gnu-users-never-heard-of-gnu.ja.po   1 Jul 2021 02:03:47 -0000       
1.27
+++ gnu/po/gnu-users-never-heard-of-gnu.ja.po   30 Aug 2021 13:34:53 -0000      
1.28
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2014-04-28 15:44+0900\n"
 "Last-Translator: NIIBE Yutaka <gniibe@fsij.org>\n"
 "Language-Team: Japanese <web-translators-ja@gnu.org>\n"
@@ -15,6 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -24,33 +25,28 @@
 "GNUについてまったく聞いたことのないGNUユーザ - 
GNUプロジェクト - フリーソフト"
 "ウェアファウンデーション"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU Users Who Have Never Heard of&nbsp;GNU"
 msgstr "GNUについてまったく聞いたことのないGNUユーザ"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a 
href=\"https://www.stallman.org/\";>リチャード・ストールマン</a>著"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
-"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>."
-msgstr ""
-"この問題についてもっとよく知るには、わたしたちの<a 
href=\"/gnu/gnu-linux-faq."
-"html\">GNU/LinuxのFAQ</a>のページ、<a 
href=\"/gnu/why-gnu-linux.html\">なぜ"
-"GNU/Linux?</a>のページ、そして、<a 
href=\"/gnu/linux-and-gnu.html\">Linuxと"
-"GNUプロジェクト</a>のページをご覧ください。"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Most people have never heard of GNU.  Even most of the people who use the "
+#| "GNU system have never heard of GNU, since so many people and companies "
+#| "teach them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say "
+#| "they are &ldquo;running Linux&rdquo;, which is like saying you are &ldquo;"
+#| "driving your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
 msgid ""
 "Most people have never heard of GNU.  Even most of the people who use the "
 "GNU system have never heard of GNU, since so many people and companies teach "
-"them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say they are "
-"&ldquo;running Linux&rdquo;, which is like saying you are &ldquo;driving "
-"your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
+"them to call it &ldquo;Linux.&rdquo; Indeed, GNU users often say they are "
+"&ldquo;running Linux,&rdquo; which is like saying you are &ldquo;driving "
+"your carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;"
 msgstr ""
 "ほとんどの人々
はGNUについて聞いたことがありません。GNUシステム
を使っているほ"
 "とんどの人々
でさえGNUについて聞いたことがありません。たくさんの人ã€
…と会社がそ"
@@ -58,7 +54,7 @@
 
"「Linuxを動かす」と言いますが、これは「キャブレターを運転する」とか「トランス"
 "ミッションを運転する」と言うようなものです。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonetheless, those who know about GNU associate it with the ideals of "
 "freedom of the free software movement.  That association is no accident; the "
@@ -69,7 +65,7 @@
 
"の理想と結びつけます。この関連は偶然ではありません。GNUを開発する動機はまさに"
 
"コンピュータを使って、自由を有することを可能とするためã
 ã£ãŸã®ã§ã™ã€‚"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "A person seeing the name &ldquo;GNU&rdquo; for the first time in &ldquo;GNU/"
 "Linux&rdquo; won't immediately know what it represents, but has come one "
@@ -86,7 +82,7 @@
 
"\"/home.html\">gnu.org</a>とWikipediaにあります。Webのまわりにもあります。も"
 
"しそのようなユーザーがGNUについて探せば、GNUが表す考えを見つけるでしょう。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If they don't search, they may encounter them anyway.  The <a href=\"/"
 "philosophy/open-source-misses-the-point.html\">&ldquo;open source&rdquo;</a> "
@@ -105,14 +101,23 @@
 "知っていれば、読者はGNUに関する情å 
±(それが自由とコミュニティのための運動の仕"
 
"事であるというような)に注意を払いやすくなるでしょう。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness "
+#| "of the ideals of freedom for which we developed the GNU system.  It is "
+#| "also useful as a reminder for people in our community who know about "
+#| "these ideals, in a world where much of discussion of free software takes "
+#| "a totally practical (and thus amoral) approach.  When we ask you to call "
+#| "the system &ldquo;GNU/Linux&rdquo;, we are asking you to help in making "
+#| "the public aware of the free software ideals."
 msgid ""
 "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of "
 "the ideals of freedom for which we developed the GNU system.  It is also "
 "useful as a reminder for people in our community who know about these "
 "ideals, in a world where much of discussion of free software takes a totally "
 "practical (and thus amoral) approach.  When we ask you to call the system "
-"&ldquo;GNU/Linux&rdquo;, we are asking you to help in making the public "
+"&ldquo;GNU/Linux,&rdquo; we are asking you to help in making the public "
 "aware of the free software ideals."
 msgstr ""
 "時につれて、システム
を&ldquo;GNU/Linux&rdquo;と呼ぶことは、GNUシステムをわた"
@@ -123,6 +128,24 @@
 "ぶことを求めるとき、わたしたちは、å…
¬è¡†ãŒè‡ªç”±ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã®ç†æƒ³ã‚’知るように手"
 "伝ってくだ
さい、と、あなたに、お願いしているのです。"
 
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
+#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-"
+#| "gnu.html\">Linux and the GNU Project</a>."
+msgid ""
+"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
+"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>."
+msgstr ""
+"この問題についてもっとよく知るには、わたしたちの<a 
href=\"/gnu/gnu-linux-faq."
+"html\">GNU/LinuxのFAQ</a>のページ、<a 
href=\"/gnu/why-gnu-linux.html\">なぜ"
+"GNU/Linux?</a>のページ、そして、<a 
href=\"/gnu/linux-and-gnu.html\">Linuxと"
+"GNUプロジェクト</a>のページをご覧ください。"
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -165,12 +188,10 @@
 "README.translations.html\">翻訳 README</a>をご覧ください。"
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -193,6 +214,13 @@
 msgstr "最終更新:"
 
 #~ msgid ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+
+#~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"
 #~ msgstr ""

Index: gnu/po/gnu-users-never-heard-of-gnu.ml-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.ml-diff.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gnu/po/gnu-users-never-heard-of-gnu.ml-diff.html    7 Apr 2021 18:04:00 
-0000       1.7
+++ gnu/po/gnu-users-never-heard-of-gnu.ml-diff.html    30 Aug 2021 13:34:53 
-0000      1.8
@@ -10,41 +10,36 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;GNU Users Who Have Never Heard of GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/gnu/po/gnu-users-never-heard-of-gnu.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;GNU</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;GNU</em></ins></span> 
Users Who Have Never Heard <span class="removed"><del><strong>of GNU&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;GNU Users Who Have Never Heard <span class="removed"><del><strong>of 
GNU&lt;/h2&gt;
 
-&lt;p&gt;&lt;strong&gt;by</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU&lt;/h2&gt;
+&lt;p&gt;&lt;strong&gt;by &lt;a href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
-&lt;address class="byline c"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
-<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;
-
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;To</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;To</em></ins></span> learn more about 
this issue, you can also read
+  &lt;blockquote&gt;&lt;p&gt;To learn more about this issue, you can also read
 our &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;, our page 
on 
 &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt; 
-and our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
Project&lt;/a&gt;.
-<span 
class="removed"><del><strong>&lt;/p&gt;&lt;/blockquote&gt;</strong></del></span>
-<span class="inserted"><ins><em>&lt;/p&gt;</em></ins></span>
-&lt;/div&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;
+and our page on</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU&lt;/h2&gt;
+
+&lt;address class="byline"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="/gnu/linux-and-gnu.html"&gt;Linux and the 
GNU Project&lt;/a&gt;.
+&lt;/p&gt;&lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;Most people have never heard of GNU.  Even most of the people who
 use the GNU system have never heard of GNU, <span 
class="removed"><del><strong>thanks to</strong></del></span> <span 
class="inserted"><ins><em>since</em></ins></span> so many people and
-companies <span class="removed"><del><strong>who</strong></del></span> teach 
them to call it &ldquo;Linux&rdquo;.  <span 
class="removed"><del><strong>Nonetheless,
-the name</strong></del></span>  <span 
class="inserted"><ins><em>Indeed,</em></ins></span> GNU <span 
class="removed"><del><strong>has certain associations, which people will 
discover once</strong></del></span>
-<span class="inserted"><ins><em>users often say</em></ins></span> they <span 
class="removed"><del><strong>hear the name.  GNU</strong></del></span> <span 
class="inserted"><ins><em>are &ldquo;running Linux&rdquo;, 
which</em></ins></span> is <span 
class="removed"><del><strong>associated</strong></del></span> <span 
class="inserted"><ins><em>like
+companies <span class="removed"><del><strong>who</strong></del></span> teach 
them to call it <span class="removed"><del><strong>&ldquo;Linux&rdquo;.  
Nonetheless,
+the name</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;  Indeed,</em></ins></span> GNU 
<span class="removed"><del><strong>has certain associations, which people will 
discover once</strong></del></span>
+<span class="inserted"><ins><em>users often say</em></ins></span> they <span 
class="removed"><del><strong>hear the name.  GNU</strong></del></span> <span 
class="inserted"><ins><em>are &ldquo;running Linux,&rdquo; 
which</em></ins></span> is <span 
class="removed"><del><strong>associated</strong></del></span> <span 
class="inserted"><ins><em>like
 saying you are &ldquo;driving your carburetor&rdquo; or
-&ldquo;driving your transmission&rdquo;.&lt;/p&gt;
+&ldquo;driving your transmission.&rdquo;&lt;/p&gt;
 
 &lt;p&gt;Nonetheless, those who know about GNU associate it</em></ins></span> 
with the ideals
 of freedom of the free software movement.  That association is no
@@ -64,9 +59,9 @@
 href="http://www.gnu.org"&gt;www.gnu.org&lt;/a&gt;, which talks about free
 software and freedom.&lt;/p&gt;
 
-&lt;p&gt;A person seeing the name &ldquo;GNU&rdquo; for</strong></del></span> 
the <span class="removed"><del><strong>first time in
+&lt;p&gt;A person seeing the name &ldquo;GNU&rdquo; for the first time in
 &ldquo;GNU/Linux&rdquo; won't immediately associate it with anything.
-However, when people know that the system is basically GNU, that brings
+However, when people know that</strong></del></span> the <span 
class="removed"><del><strong>system is basically GNU, that brings
 them a step closer to learning about our ideals.  For instance, they
 might become curious and look for more information about 
GNU.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>ideas GNU 
stands for.&lt;/p&gt;</em></ins></span>
 
@@ -86,10 +81,19 @@
 system.  It is also useful as a reminder for people in our community
 who know about these ideals, in a world where much of discussion of
 free software takes a totally practical (and thus amoral) approach.
-When we ask you to call the system &ldquo;GNU/Linux&rdquo;, we <span 
class="removed"><del><strong>do so because
+When we ask you to call the system <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> we 
<span class="removed"><del><strong>do so because
 awareness of GNU slowly but surely brings with it 
awareness</strong></del></span> <span class="inserted"><ins><em>are
-asking you to help in making the public aware</em></ins></span> of the free 
software <span class="removed"><del><strong>ideals of freedom and 
community.&lt;/p&gt;</strong></del></span>
+asking you to help in making the public aware</em></ins></span> of the free 
software <span class="removed"><del><strong>ideals of 
freedom</strong></del></span>
 <span class="inserted"><ins><em>ideals.&lt;/p&gt;
+
+&lt;div class="announcement comment" role="complementary"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;p&gt;To learn more about this issue, you can also read
+our &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;, our page 
on 
+&lt;a href="/gnu/why-gnu-linux.html"&gt;Why 
GNU/Linux?&lt;/a&gt;</em></ins></span> 
+and <span 
class="removed"><del><strong>community.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>our page on &lt;a 
href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU System&lt;/a&gt;.
+&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
 &lt;/div&gt;
 &lt;/div&gt;</em></ins></span>
 
@@ -140,7 +144,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2006, 2007, <span class="removed"><del><strong>2013, 
2014</strong></del></span> <span class="inserted"><ins><em>2013-2015, 2017, 
2019, 2021</em></ins></span> Free Software
+&lt;p&gt;Copyright &copy; 2006, <span class="removed"><del><strong>2007, 2013, 
2014</strong></del></span> <span class="inserted"><ins><em>2015, 
2021</em></ins></span> Free Software
 Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
@@ -152,11 +156,12 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/04/07 18:04:00 $
+$Date: 2021/08/30 13:34:53 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-&lt;/div&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for class="inner", starts 
in the banner include --&gt;</em></ins></span>
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>

Index: gnu/po/gnu-users-never-heard-of-gnu.ml.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.ml.po,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- gnu/po/gnu-users-never-heard-of-gnu.ml.po   7 Apr 2021 18:04:00 -0000       
1.30
+++ gnu/po/gnu-users-never-heard-of-gnu.ml.po   30 Aug 2021 13:34:54 -0000      
1.31
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2014-05-04 17:52+0530\n"
 "Last-Translator: Navaneeth <navaneeth@gnu.org>\n"
 "Language-Team: Malayalam <web-translators@gnu.org>\n"
@@ -26,7 +26,7 @@
 msgstr ""
 "ഗ്നുവിനെപ്പറ്റി 
കേള്‍ക്കാത്ത ഗ്നു 
ഉപയോക്താക്കള്‍ - ഗ്നു സംരംഭം - 
സ്വതന്ത്രസോഫ്റ്റ്‌വെയര്‍ 
പ്രസ്ഥാനം"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 # | GNU Users Who Have Never Heard [-of GNU-] {+of&nbsp;GNU+}
 #, fuzzy
 #| msgid "GNU Users Who Have Never Heard of GNU"
@@ -34,47 +34,25 @@
 msgstr "ഗ്നുവിനെ പറ്റി 
കേള്‍ക്കാത്ത ഗ്നു 
ഉപയോക്താക്കള്‍"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 # | by <a href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a>
 #, fuzzy
 #| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "എഴുതിയതു് <a 
href=\"http://www.stallman.org/\";>റിച്ചാര്‍ഡ് 
സ്റ്റാള്‍മാന്‍</a>"
 
-#. type: Content of: <div><div><p>
-# | To learn more about this issue, you can also read our <a
-# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
-# | href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a
-# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project.-]
-# | {+Project</a>.+}
-#, fuzzy
-#| msgid ""
-#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
-#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-"
-#| "gnu.html\">Linux and the GNU Project."
-msgid ""
-"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
-"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>."
-msgstr ""
-"ഈ വിഷയത്തെക്കുറിച്ചു് 
കൂടുതല്‍ അറിയാന്‍ <a 
href=\"/gnu/gnu-linux-faq.html\"> ഗ്നു/ലിനക്സ് "
-"ചോദ്യോത്തരങ്ങള്‍</a>, <a 
href=\"/gnu/why-gnu-linux.html\">എന്തുകൊണ്ട് 
ഗ്നു/ലിനക്സ്?</a>, "
-"<a href=\"/gnu/linux-and-gnu.html\">ലിനക്സും ഗ്നു 
സംരംഭവും</a> എന്നീ ലേഖനങ്ങള്‍ 
കാണുക."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Most people have never heard of GNU.  Even most of the people who use the
 # | GNU system have never heard of GNU, [-thanks to-] {+since+} so many people
-# | and companies [-who-] teach them to call it &ldquo;Linux&rdquo;. 
-# | [-Nonetheless, the name-]  {+Indeed,+} GNU [-has certain associations,
-# | which people will discover once-] {+users often say+} they [-hear the
-# | name.  GNU is associated with the ideals of freedom of the free software
-# | movement.  That association-] {+are &ldquo;running Linux&rdquo;, which+}
-# | is [-no accident; the motive for developing GNU was specifically to make
-# | it possible to use a computer and have freedom.-] {+like saying you are
-# | &ldquo;driving your carburetor&rdquo; or &ldquo;driving your
-# | transmission&rdquo;.+}
+# | and companies [-who-] teach them to call it [-&ldquo;Linux&rdquo;. 
+# | Nonetheless, the name-] {+&ldquo;Linux.&rdquo; Indeed,+} GNU [-has certain
+# | associations, which people will discover once-] {+users often say+} they
+# | [-hear the name.  GNU is associated with the ideals of freedom of the free
+# | software movement.  That association-] {+are &ldquo;running Linux,&rdquo;
+# | which+} is [-no accident; the motive for developing GNU was specifically
+# | to make it possible to use a computer and have freedom.-] {+like saying
+# | you are &ldquo;driving your carburetor&rdquo; or &ldquo;driving your
+# | transmission.&rdquo;+}
 #, fuzzy
 #| msgid ""
 #| "Most people have never heard of GNU.  Even most of the people who use the "
@@ -88,9 +66,9 @@
 msgid ""
 "Most people have never heard of GNU.  Even most of the people who use the "
 "GNU system have never heard of GNU, since so many people and companies teach "
-"them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say they are "
-"&ldquo;running Linux&rdquo;, which is like saying you are &ldquo;driving "
-"your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
+"them to call it &ldquo;Linux.&rdquo; Indeed, GNU users often say they are "
+"&ldquo;running Linux,&rdquo; which is like saying you are &ldquo;driving "
+"your carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;"
 msgstr ""
 "മിക്കവാറും ആളുകളും 
ഗ്നുവിനെപ്പറ്റി 
കേള്‍ക്കാത്തവരാണു്. ഗ്നു 
സിസ്റ്റം ഉപയോഗിക്കുന്നവര്‍ 
പോലും "
 "ഗ്നുവിനെപ്പറ്റി 
കേള്‍ക്കാത്തവരാണു, കാരണം 
കുറെ ആളുകളും സ്ഥാപനങ്ങളും അ
തിനെ &ldquo;ലിനക്സ് "
@@ -100,7 +78,7 @@
 "കമ്പ്യൂട്ടറിന്റെ 
സ്വതന്ത്രമായ ഉപയോഗം 
സാധ്യമാക്കുക എന്നതായിരുന്നു 
ഗ്നു വികസിപ്പിക്കാനുള്ള 
ഏറ്റവും "
 "വലിയ പ്രേരണ."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | [-Most people have never heard of GNU.  Even most of the
 # | people-]{+Nonetheless, those+} who [-use the-] {+know about+} GNU [-system
 # | have never heard of GNU, thanks to so many people and companies who teach
@@ -134,7 +112,7 @@
 "കമ്പ്യൂട്ടറിന്റെ 
സ്വതന്ത്രമായ ഉപയോഗം 
സാധ്യമാക്കുക എന്നതായിരുന്നു 
ഗ്നു വികസിപ്പിക്കാനുള്ള 
ഏറ്റവും "
 "വലിയ പ്രേരണ."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | {+A person seeing the name &ldquo;GNU&rdquo; for the first time in
 # | &ldquo;GNU/Linux&rdquo; won't immediately know what it represents, but has
 # | come one step closer to finding out.+}  The association between the name
@@ -167,7 +145,7 @@
 "പറ്റി തേടുമ്പോള്‍ അവര്‍ക്കു 
<a href=\"http://www.gnu.org\";>gnu.org</a>-ല്‍ 
സ്വതന്ത്ര "
 "സോഫ്റ്റ്‌വെയറിനെപ്പറ്റി 
പറഞ്ഞിരിക്കുന്നതു കാണാം."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | [-A person seeing the name &ldquo;GNU&rdquo; for the first time in
 # | &ldquo;GNU/Linux&rdquo; won't immediately associate it with anything. 
 # | However, when people know that the system is basically GNU, that brings
@@ -223,16 +201,16 @@
 "(അതായതു, ഇതു 
സ്വാതന്ത്രത്തിനും 
സമൂഹത്തിനും വേണ്ടിയുള്ള ഒരു 
പ്രസ്ഥാനത്തിന്റെ 
പ്രയത്നമാണെന്നു "
 "മനസ്സിലാക്കുമ്പോള്‍)."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of
 # | the ideals of freedom for which we developed the GNU system.  It is also
 # | useful as a reminder for people in our community who know about these
 # | ideals, in a world where much of discussion of free software takes a
 # | totally practical (and thus amoral) approach.  When we ask you to call the
-# | system &ldquo;GNU/Linux&rdquo;, we [-do so because awareness of GNU slowly
-# | but surely brings with it awareness-] {+are asking you to help in making
-# | the public aware+} of the free software [-ideals of freedom and
-# | community.-] {+ideals.+}
+# | system [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} we [-do
+# | so because awareness of GNU slowly but surely brings with it awareness-]
+# | {+are asking you to help in making the public aware+} of the free software
+# | [-ideals of freedom and community.-] {+ideals.+}
 #, fuzzy
 #| msgid ""
 #| "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness "
@@ -249,7 +227,7 @@
 "useful as a reminder for people in our community who know about these "
 "ideals, in a world where much of discussion of free software takes a totally "
 "practical (and thus amoral) approach.  When we ask you to call the system "
-"&ldquo;GNU/Linux&rdquo;, we are asking you to help in making the public "
+"&ldquo;GNU/Linux,&rdquo; we are asking you to help in making the public "
 "aware of the free software ideals."
 msgstr ""
 "കാലാന്തരത്തില്‍, ഈ 
സിസ്റ്റത്തെ 
&ldquo;ഗ്നു/ലിനക്സ്&rdquo; എന്നു 
വിളിക്കുന്നതുഗ്നു 
സിസ്റ്റത്തെ "
@@ -259,6 +237,28 @@
 "ലിനക്സെന്നു&rdquo; വിളിക്കാന്‍ 
പറയുമ്പോള്‍, ഗ്നുവെന്ന അ
വബോധം, 
സാവധാനത്തില്ലെങ്കിലും 
തീര്‍ച്ചയായും "
 "സ്വാതന്ത്ര്യയത്തിന്റെയും 
സമൂഹത്തിന്റെയും 
ആശയങ്ങളുമായുള്ള ഒരു അ
വബോധമായി 
നാമെല്ലാവരില്ലുമുണ്ടാക്കും."
 
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project.-]
+# | {+System</a>.+}
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
+#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-"
+#| "gnu.html\">Linux and the GNU Project."
+msgid ""
+"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
+"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>."
+msgstr ""
+"ഈ വിഷയത്തെക്കുറിച്ചു് 
കൂടുതല്‍ അറിയാന്‍ <a 
href=\"/gnu/gnu-linux-faq.html\"> ഗ്നു/ലിനക്സ് "
+"ചോദ്യോത്തരങ്ങള്‍</a>, <a 
href=\"/gnu/why-gnu-linux.html\">എന്തുകൊണ്ട് 
ഗ്നു/ലിനക്സ്?</a>, "
+"<a href=\"/gnu/linux-and-gnu.html\">ലിനക്സും ഗ്നു 
സംരംഭവും</a> എന്നീ ലേഖനങ്ങള്‍ 
കാണുക."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -310,16 +310,14 @@
 "താളുകളുടെ പരിഭാഷകൾ 
സമർപ്പിക്കാനും ബന്ധപ്പെട്ട 
വിവരങ്ങൾക്കും <a href=\"/server/standards/"
 "README.translations.html\">Translations README</a> നോക്കുക."
 
+# type: Content of: <div><p>
 #. type: Content of: <div><p>
-# | Copyright &copy; 2006, 2007, [-2013, 2014-] {+2013-2015, 2017, 2019,
-# | 2021+} Free Software Foundation, Inc.
+# | Copyright &copy; [-2010-] {+2006, 2015, 2021+} Free Software Foundation,
+# | Inc.
 #, fuzzy
-#| msgid ""
-#| "Copyright &copy; 2006, 2007, 2013, 2014 Free Software Foundation, Inc."
-msgid ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
-msgstr "Copyright &copy; 2006, 2007, 2013, 2014 Free Software Foundation, Inc."
+#| msgid "Copyright &copy; 2010 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2010 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -342,6 +340,15 @@
 msgid "Updated:"
 msgstr "പുതുക്കിയതു്:"
 
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 2006, 2007, 2013, 2014 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2006, 2007, 2013, 2014 Free Software Foundation, Inc."
+
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"

Index: gnu/po/gnu-users-never-heard-of-gnu.nl.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.nl.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- gnu/po/gnu-users-never-heard-of-gnu.nl.po   30 May 2021 20:26:35 -0000      
1.22
+++ gnu/po/gnu-users-never-heard-of-gnu.nl.po   30 Aug 2021 13:34:54 -0000      
1.23
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Justin van Steijn <jvs@fsfe.org>\n"
 "Language-Team: Dutch\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-08-30 13:26+0000\n"
 "X-Generator: Poedit 1.8.11\n"
 
 #. type: Content of: <title>
@@ -26,33 +27,35 @@
 "GNU-gebruikers die nog nooit van GNU gehoord hebben - GNU-project - Free "
 "Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU Users Who Have Never Heard of&nbsp;GNU"
 msgstr "GNU-gebruikers die nog nooit van GNU gehoord&nbsp;hebben"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "door <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
-"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>."
-msgstr ""
-"Om meer over dit onderwerp te weten te komen kun je ook de <a href=\"/gnu/"
-"gnu-linux-faq.html\">GNU/Linux veelgestelde vragen</a> lezen, of ons artikel "
-"<a href=\"/gnu/why-gnu-linux.html\">Waarom GNU/Linux?</a> en <a href= \"/gnu/"
-"linux-and-gnu.html\">Linux en het GNU-project</a>."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Most people have never heard of GNU.  Even most of the people who use the
+# | GNU system have never heard of GNU, since so many people and companies
+# | teach them to call it [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+# | Indeed, GNU users often say they are &ldquo;running [-Linux&rdquo;,-]
+# | {+Linux,&rdquo;+} which is like saying you are &ldquo;driving your
+# | carburetor&rdquo; or &ldquo;driving your [-transmission&rdquo;.-]
+# | {+transmission.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Most people have never heard of GNU.  Even most of the people who use the "
+#| "GNU system have never heard of GNU, since so many people and companies "
+#| "teach them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say "
+#| "they are &ldquo;running Linux&rdquo;, which is like saying you are &ldquo;"
+#| "driving your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
 msgid ""
 "Most people have never heard of GNU.  Even most of the people who use the "
 "GNU system have never heard of GNU, since so many people and companies teach "
-"them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say they are "
-"&ldquo;running Linux&rdquo;, which is like saying you are &ldquo;driving "
-"your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
+"them to call it &ldquo;Linux.&rdquo; Indeed, GNU users often say they are "
+"&ldquo;running Linux,&rdquo; which is like saying you are &ldquo;driving "
+"your carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;"
 msgstr ""
 "De meeste mensen hebben nog nooit gehoord van GNU. Zelfs de meesten die GNU "
 "gebruiken hebben nog nooit van GNU gehoord, omdat mensen en bedrijven hen "
@@ -61,7 +64,7 @@
 "over &ldquo;je verbrandingsmotor rijden&rdquo; of &ldquo;je versnellingsbak "
 "rijden&rdquo;."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonetheless, those who know about GNU associate it with the ideals of "
 "freedom of the free software movement.  That association is no accident; the "
@@ -73,7 +76,7 @@
 "softwarebeweging. Deze associatie berust niet op toeval; de motivatie voor "
 "het ontwikkelen van GNU was het gebruiken van software in alle vrijheid."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "A person seeing the name &ldquo;GNU&rdquo; for the first time in &ldquo;GNU/"
 "Linux&rdquo; won't immediately know what it represents, but has come one "
@@ -92,7 +95,7 @@
 "Het is te vinden op het web; wanneer deze mensen zoeken op GNU, zullen ze "
 "uitvinden voor welke idee&euml;n GNU staat."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If they don't search, they may encounter them anyway.  The <a href=\"/"
 "philosophy/open-source-misses-the-point.html\">&ldquo;open source&rdquo;</a> "
@@ -112,14 +115,30 @@
 "voor het verhaal van GNU (over onze campagne voor vrijheid en "
 "gemeenschapszin) wanneer ze weten dat ze gebruikers zijn van het GNU-systeem."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of
+# | the ideals of freedom for which we developed the GNU system.  It is also
+# | useful as a reminder for people in our community who know about these
+# | ideals, in a world where much of discussion of free software takes a
+# | totally practical (and thus amoral) approach.  When we ask you to call the
+# | system [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} we are
+# | asking you to help in making the public aware of the free software ideals.
+#, fuzzy
+#| msgid ""
+#| "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness "
+#| "of the ideals of freedom for which we developed the GNU system.  It is "
+#| "also useful as a reminder for people in our community who know about "
+#| "these ideals, in a world where much of discussion of free software takes "
+#| "a totally practical (and thus amoral) approach.  When we ask you to call "
+#| "the system &ldquo;GNU/Linux&rdquo;, we are asking you to help in making "
+#| "the public aware of the free software ideals."
 msgid ""
 "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of "
 "the ideals of freedom for which we developed the GNU system.  It is also "
 "useful as a reminder for people in our community who know about these "
 "ideals, in a world where much of discussion of free software takes a totally "
 "practical (and thus amoral) approach.  When we ask you to call the system "
-"&ldquo;GNU/Linux&rdquo;, we are asking you to help in making the public "
+"&ldquo;GNU/Linux,&rdquo; we are asking you to help in making the public "
 "aware of the free software ideals."
 msgstr ""
 "Verwijzen naar het systeem als &ldquo;GNU/Linux&rdquo; zal op lange termijn "
@@ -130,6 +149,29 @@
 "vragen het systeem &ldquo;GNU/Linux&rdquo; te noemen, doen we dit om een "
 "bewustwording op gang te brengen over de idealen van vrije software."
 
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>.-]
+# | {+System</a>.+}
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
+#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-"
+#| "gnu.html\">Linux and the GNU Project</a>."
+msgid ""
+"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
+"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>."
+msgstr ""
+"Om meer over dit onderwerp te weten te komen kun je ook de <a href=\"/gnu/"
+"gnu-linux-faq.html\">GNU/Linux veelgestelde vragen</a> lezen, of ons artikel "
+"<a href=\"/gnu/why-gnu-linux.html\">Waarom GNU/Linux?</a> en <a href= \"/gnu/"
+"linux-and-gnu.html\">Linux en het GNU-project</a>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -172,13 +214,14 @@
 "href=\"/server/standards/README.translations.html\"> Translations README</a> "
 "voor informatie over het onderhoud van vertalingen op deze website."
 
+# type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
+# | Copyright &copy; [-2011-] {+2006, 2015, 2021+} Free Software Foundation,
+# | Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -203,6 +246,13 @@
 msgstr "Bijgewerkt:"
 
 #~ msgid ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+
+#~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"
 #~ msgstr ""

Index: gnu/po/gnu-users-never-heard-of-gnu.pl.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.pl.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- gnu/po/gnu-users-never-heard-of-gnu.pl.po   7 Jun 2021 07:59:35 -0000       
1.29
+++ gnu/po/gnu-users-never-heard-of-gnu.pl.po   30 Aug 2021 13:34:54 -0000      
1.30
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2015-07-19 15:32-0600\n"
 "Last-Translator: Jan Owoc <jsowoc AT gmail.com>\n"
 "Language-Team: Polish <www-pl-trans@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-08-30 13:26+0000\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Virtaal 0.7.1\n"
@@ -29,33 +30,35 @@
 "Użytkownicy GNU, którzy nigdy o GNU nie słyszeli - Projekt GNU - Fundacja "
 "Wolnego Oprogramowania (FSF)"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU Users Who Have Never Heard of&nbsp;GNU"
 msgstr "Użytkownicy GNU, którzy nigdy o GNU nie&nbsp;słyszeli"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
-"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>."
-msgstr ""
-"Aby&nbsp;dowiedzieć się więcej na&nbsp;ten temat możecie również 
przeczytać "
-"<a href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, stronę &bdquo;<a 
href="
-"\"/gnu/why-gnu-linux.html\">Dlaczego GNU/Linux?</a>&rdquo; oraz&nbsp;&bdquo;"
-"<a href=\"/gnu/linux-and-gnu.html\">Linux i&nbsp;Projekt GNU</a>&rdquo;."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Most people have never heard of GNU.  Even most of the people who use the
+# | GNU system have never heard of GNU, since so many people and companies
+# | teach them to call it [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+# | Indeed, GNU users often say they are &ldquo;running [-Linux&rdquo;,-]
+# | {+Linux,&rdquo;+} which is like saying you are &ldquo;driving your
+# | carburetor&rdquo; or &ldquo;driving your [-transmission&rdquo;.-]
+# | {+transmission.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Most people have never heard of GNU.  Even most of the people who use the "
+#| "GNU system have never heard of GNU, since so many people and companies "
+#| "teach them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say "
+#| "they are &ldquo;running Linux&rdquo;, which is like saying you are &ldquo;"
+#| "driving your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
 msgid ""
 "Most people have never heard of GNU.  Even most of the people who use the "
 "GNU system have never heard of GNU, since so many people and companies teach "
-"them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say they are "
-"&ldquo;running Linux&rdquo;, which is like saying you are &ldquo;driving "
-"your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
+"them to call it &ldquo;Linux.&rdquo; Indeed, GNU users often say they are "
+"&ldquo;running Linux,&rdquo; which is like saying you are &ldquo;driving "
+"your carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;"
 msgstr ""
 "Większość ludzi nigdy nie słyszała o systemie GNU. Co więcej, nawet "
 "większość użytkowników systemu GNU nigdy o nim nie słyszała, 
ponieważ&nbsp;"
@@ -64,7 +67,7 @@
 "co jest analogiczne z&nbsp;mówieniem, że&nbsp;&bdquo;jadą 
gaźnikiem&rdquo; "
 "albo&nbsp;&bdquo;jadą skrzynią biegów&rdquo;."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonetheless, those who know about GNU associate it with the ideals of "
 "freedom of the free software movement.  That association is no accident; the "
@@ -76,7 +79,7 @@
 "przypadkowe. Motywacją do&nbsp;rozwoju GNU było aby&nbsp;móc używać 
komputer "
 "i&nbsp;posiadać wolność."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "A person seeing the name &ldquo;GNU&rdquo; for the first time in &ldquo;GNU/"
 "Linux&rdquo; won't immediately know what it represents, but has come one "
@@ -95,7 +98,7 @@
 "html\">gnu.org</a> i&nbsp;w&nbsp;Wikipedii. Istnieje w&nbsp;Sieci; jeśli te "
 "osoby poszukają GNU, znajdą co to znaczy GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If they don't search, they may encounter them anyway.  The <a href=\"/"
 "philosophy/open-source-misses-the-point.html\">&ldquo;open source&rdquo;</a> "
@@ -117,14 +120,30 @@
 "wolności oraz&nbsp;społeczności) jeśli wiedzą, że&nbsp;są 
użytkownikami "
 "systemu GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of
+# | the ideals of freedom for which we developed the GNU system.  It is also
+# | useful as a reminder for people in our community who know about these
+# | ideals, in a world where much of discussion of free software takes a
+# | totally practical (and thus amoral) approach.  When we ask you to call the
+# | system [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} we are
+# | asking you to help in making the public aware of the free software ideals.
+#, fuzzy
+#| msgid ""
+#| "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness "
+#| "of the ideals of freedom for which we developed the GNU system.  It is "
+#| "also useful as a reminder for people in our community who know about "
+#| "these ideals, in a world where much of discussion of free software takes "
+#| "a totally practical (and thus amoral) approach.  When we ask you to call "
+#| "the system &ldquo;GNU/Linux&rdquo;, we are asking you to help in making "
+#| "the public aware of the free software ideals."
 msgid ""
 "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of "
 "the ideals of freedom for which we developed the GNU system.  It is also "
 "useful as a reminder for people in our community who know about these "
 "ideals, in a world where much of discussion of free software takes a totally "
 "practical (and thus amoral) approach.  When we ask you to call the system "
-"&ldquo;GNU/Linux&rdquo;, we are asking you to help in making the public "
+"&ldquo;GNU/Linux,&rdquo; we are asking you to help in making the public "
 "aware of the free software ideals."
 msgstr ""
 "Z&nbsp;biegiem czasu nazywanie systemu &ldquo;GNU/Linux&rdquo; rozwija "
@@ -135,6 +154,29 @@
 "systemu &ldquo;GNU/Linux&rdquo;, prosimy abyście pomogli uświadamiać ludzi 
o "
 "ideałach wolnego oprogramowania."
 
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>.-]
+# | {+System</a>.+}
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
+#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-"
+#| "gnu.html\">Linux and the GNU Project</a>."
+msgid ""
+"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
+"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>."
+msgstr ""
+"Aby&nbsp;dowiedzieć się więcej na&nbsp;ten temat możecie również 
przeczytać "
+"<a href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, stronę &bdquo;<a 
href="
+"\"/gnu/why-gnu-linux.html\">Dlaczego GNU/Linux?</a>&rdquo; oraz&nbsp;&bdquo;"
+"<a href=\"/gnu/linux-and-gnu.html\">Linux i&nbsp;Projekt GNU</a>&rdquo;."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -182,12 +224,12 @@
 "tłumaczeń</a>."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
+# | Copyright &copy; [-2014, 2015-] {+2006, 2015, 2021+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -211,3 +253,10 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Aktualizowane:"
+
+#~ msgid ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."

Index: gnu/po/gnu-users-never-heard-of-gnu.pot
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.pot,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- gnu/po/gnu-users-never-heard-of-gnu.pot     7 Apr 2021 18:04:00 -0000       
1.19
+++ gnu/po/gnu-users-never-heard-of-gnu.pot     30 Aug 2021 13:34:54 -0000      
1.20
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,32 +22,24 @@
 "Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU Users Who Have Never Heard of&nbsp;GNU"
 msgstr ""
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our <a "
-"href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a "
-"href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a "
-"href=\"/gnu/linux-and-gnu.html\">Linux and the GNU Project</a>."
-msgstr ""
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most people have never heard of GNU.  Even most of the people who use the "
 "GNU system have never heard of GNU, since so many people and companies teach "
-"them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say they are "
-"&ldquo;running Linux&rdquo;, which is like saying you are &ldquo;driving "
-"your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
+"them to call it &ldquo;Linux.&rdquo; Indeed, GNU users often say they are "
+"&ldquo;running Linux,&rdquo; which is like saying you are &ldquo;driving "
+"your carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonetheless, those who know about GNU associate it with the ideals of "
 "freedom of the free software movement.  That association is no accident; the "
@@ -55,7 +47,7 @@
 "computer and have freedom."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "A person seeing the name &ldquo;GNU&rdquo; for the first time in "
 "&ldquo;GNU/Linux&rdquo; won't immediately know what it represents, but has "
@@ -67,7 +59,7 @@
 "for."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If they don't search, they may encounter them anyway.  The <a "
 "href=\"/philosophy/open-source-misses-the-point.html\">&ldquo;open "
@@ -79,17 +71,25 @@
 "know they are users of the GNU system."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of "
 "the ideals of freedom for which we developed the GNU system.  It is also "
 "useful as a reminder for people in our community who know about these "
 "ideals, in a world where much of discussion of free software takes a totally "
 "practical (and thus amoral) approach.  When we ask you to call the system "
-"&ldquo;GNU/Linux&rdquo;, we are asking you to help in making the public "
+"&ldquo;GNU/Linux,&rdquo; we are asking you to help in making the public "
 "aware of the free software ideals."
 msgstr ""
 
+#. type: Content of: <div><div><p>
+msgid ""
+"To learn more about this issue, you can also read our <a "
+"href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a "
+"href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a "
+"href=\"/gnu/linux-and-gnu.html\">Linux and the GNU System</a>."
+msgstr ""
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -127,9 +127,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
+msgid "Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc."
 msgstr ""
 
 #. type: Content of: <div><p>

Index: gnu/po/gnu-users-never-heard-of-gnu.pt-br.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.pt-br.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- gnu/po/gnu-users-never-heard-of-gnu.pt-br.po        20 Apr 2021 08:30:22 
-0000      1.18
+++ gnu/po/gnu-users-never-heard-of-gnu.pt-br.po        30 Aug 2021 13:34:54 
-0000      1.19
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-04-20 05:17-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <www-pt-br-general@gnu.org>\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Gtranslator 40.0\n"
 
@@ -27,33 +28,28 @@
 "Usuários do GNU que nunca ouviram falar do GNU - Projeto GNU - Free Software 
"
 "Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU Users Who Have Never Heard of&nbsp;GNU"
 msgstr "Usuários do GNU que nunca ouviram falar do&nbsp;GNU"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "por <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
-"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>."
-msgstr ""
-"Para saber mais sobre esse assunto, leia também nosso <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, nossa página sobre <a href=\"/gnu/why-"
-"gnu-linux.html\">Por que GNU/Linux?</a> e nossa página sobre <a href=\"/gnu/"
-"linux-and-gnu.html\">Linux e o Projeto GNU</a>."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Most people have never heard of GNU.  Even most of the people who use the "
+#| "GNU system have never heard of GNU, since so many people and companies "
+#| "teach them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say "
+#| "they are &ldquo;running Linux&rdquo;, which is like saying you are &ldquo;"
+#| "driving your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
 msgid ""
 "Most people have never heard of GNU.  Even most of the people who use the "
 "GNU system have never heard of GNU, since so many people and companies teach "
-"them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say they are "
-"&ldquo;running Linux&rdquo;, which is like saying you are &ldquo;driving "
-"your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
+"them to call it &ldquo;Linux.&rdquo; Indeed, GNU users often say they are "
+"&ldquo;running Linux,&rdquo; which is like saying you are &ldquo;driving "
+"your carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;"
 msgstr ""
 "A maioria das pessoas nunca ouviu falar do GNU. Até mesmo a maioria das "
 "pessoas que usam o sistema GNU nunca ouviram falar do GNU, graças a tantas "
@@ -62,7 +58,7 @@
 "que dizer que você está “dirigindo seu carburador” ou “dirigindo sua "
 "transmissão”."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonetheless, those who know about GNU associate it with the ideals of "
 "freedom of the free software movement.  That association is no accident; the "
@@ -74,7 +70,7 @@
 "motivo pelo qual o desenvolvimento GNU foi especificamente feito para "
 "possibilitar o seu uso em um computador e ter liberdade."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "A person seeing the name &ldquo;GNU&rdquo; for the first time in &ldquo;GNU/"
 "Linux&rdquo; won't immediately know what it represents, but has come one "
@@ -92,7 +88,7 @@
 "a> e na Wikipédia. Isso existe ao redor da web; se esses usuários "
 "pesquisarem por GNU, eles encontrarão as ideias que o GNU defende."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If they don't search, they may encounter them anyway.  The <a href=\"/"
 "philosophy/open-source-misses-the-point.html\">&ldquo;open source&rdquo;</a> "
@@ -113,14 +109,23 @@
 "resultado de uma campanha por liberdade e comunidade) se eles sabem que são "
 "usuários do sistema GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness "
+#| "of the ideals of freedom for which we developed the GNU system.  It is "
+#| "also useful as a reminder for people in our community who know about "
+#| "these ideals, in a world where much of discussion of free software takes "
+#| "a totally practical (and thus amoral) approach.  When we ask you to call "
+#| "the system &ldquo;GNU/Linux&rdquo;, we are asking you to help in making "
+#| "the public aware of the free software ideals."
 msgid ""
 "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of "
 "the ideals of freedom for which we developed the GNU system.  It is also "
 "useful as a reminder for people in our community who know about these "
 "ideals, in a world where much of discussion of free software takes a totally "
 "practical (and thus amoral) approach.  When we ask you to call the system "
-"&ldquo;GNU/Linux&rdquo;, we are asking you to help in making the public "
+"&ldquo;GNU/Linux,&rdquo; we are asking you to help in making the public "
 "aware of the free software ideals."
 msgstr ""
 "Ao longo do tempo, chamar o sistema de “GNU/Linux” dissemina a 
consciência "
@@ -132,6 +137,24 @@
 "consciência sobre o GNU conduz, lentamente mas certamente, à consciência "
 "sobre os ideais de liberdade e comunidade do software livre."
 
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
+#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-"
+#| "gnu.html\">Linux and the GNU Project</a>."
+msgid ""
+"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
+"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>."
+msgstr ""
+"Para saber mais sobre esse assunto, leia também nosso <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, nossa página sobre <a href=\"/gnu/why-"
+"gnu-linux.html\">Por que GNU/Linux?</a> e nossa página sobre <a href=\"/gnu/"
+"linux-and-gnu.html\">Linux e o Projeto GNU</a>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -177,12 +200,10 @@
 "contribuição com traduções das páginas deste site."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -208,6 +229,13 @@
 msgstr "Última atualização:"
 
 #~ msgid ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+
+#~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"
 #~ msgstr ""

Index: gnu/po/gnu-users-never-heard-of-gnu.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.ru.po,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- gnu/po/gnu-users-never-heard-of-gnu.ru.po   8 Apr 2021 11:34:36 -0000       
1.36
+++ gnu/po/gnu-users-never-heard-of-gnu.ru.po   30 Aug 2021 13:34:54 -0000      
1.37
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2019-03-22 17:17+0000\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <www-ru-list@gnu.org>\n"
@@ -15,6 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "X-Poedit-Language: Russian\n"
 
 # type: Content of: <title>
@@ -27,37 +28,37 @@
 "свободного программного обеспечения"
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU Users Who Have Never Heard of&nbsp;GNU"
 msgstr "Пользователи GNU, которые никогда не 
слышали о GNU"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"https://www.stallman.org/\";>Ричард Столмен</a>"
 
-# type: Content of: <div><blockquote><p>
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
-"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>."
-msgstr ""
-"Чтобы узнать больше об этой проблеме, вы 
также можете прочитать нашу статью "
-"<a href=\"/gnu/gnu-linux-faq.html\">&ldquo;Вопросы о 
GNU/Linux&rdquo;</a>, "
-"нашу страницу <a 
href=\"/gnu/why-gnu-linux.html\">&ldquo;Почему GNU/Linux?"
-"&rdquo;</a>, а также нашу страницу <a 
href=\"/gnu/linux-and-gnu.html"
-"\">&ldquo;Linux и проект GNU&rdquo;</a>."
-
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Most people have never heard of GNU.  Even most of the people who use the
+# | GNU system have never heard of GNU, since so many people and companies
+# | teach them to call it [-&ldquo;Linux&rdquo;.-] {+&ldquo;Linux.&rdquo;+}
+# | Indeed, GNU users often say they are &ldquo;running [-Linux&rdquo;,-]
+# | {+Linux,&rdquo;+} which is like saying you are &ldquo;driving your
+# | carburetor&rdquo; or &ldquo;driving your [-transmission&rdquo;.-]
+# | {+transmission.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Most people have never heard of GNU.  Even most of the people who use the "
+#| "GNU system have never heard of GNU, since so many people and companies "
+#| "teach them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say "
+#| "they are &ldquo;running Linux&rdquo;, which is like saying you are &ldquo;"
+#| "driving your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
 msgid ""
 "Most people have never heard of GNU.  Even most of the people who use the "
 "GNU system have never heard of GNU, since so many people and companies teach "
-"them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say they are "
-"&ldquo;running Linux&rdquo;, which is like saying you are &ldquo;driving "
-"your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
+"them to call it &ldquo;Linux.&rdquo; Indeed, GNU users often say they are "
+"&ldquo;running Linux,&rdquo; which is like saying you are &ldquo;driving "
+"your carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;"
 msgstr ""
 "Большинство людей никогда не слышали о GNU. 
Даже большинство людей, "
 "использующих систему GNU, никогда не 
слышали о GNU, поскольку так много "
@@ -67,7 +68,7 @@
 "едете на коробке передач&rdquo;."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonetheless, those who know about GNU associate it with the ideals of "
 "freedom of the free software movement.  That association is no accident; the "
@@ -79,7 +80,7 @@
 "именно создание возможности пользоваться 
компьютером, обладая свободой."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "A person seeing the name &ldquo;GNU&rdquo; for the first time in &ldquo;GNU/"
 "Linux&rdquo; won't immediately know what it represents, but has come one "
@@ -98,7 +99,7 @@
 "пользователи станут искать GNU, они найдут 
идеи, стоящие за GNU."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If they don't search, they may encounter them anyway.  The <a href=\"/"
 "philosophy/open-source-misses-the-point.html\">&ldquo;open source&rdquo;</a> "
@@ -119,14 +120,30 @@
 "единство), если они знают, что они 
пользуются системой GNU."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of
+# | the ideals of freedom for which we developed the GNU system.  It is also
+# | useful as a reminder for people in our community who know about these
+# | ideals, in a world where much of discussion of free software takes a
+# | totally practical (and thus amoral) approach.  When we ask you to call the
+# | system [-&ldquo;GNU/Linux&rdquo;,-] {+&ldquo;GNU/Linux,&rdquo;+} we are
+# | asking you to help in making the public aware of the free software ideals.
+#, fuzzy
+#| msgid ""
+#| "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness "
+#| "of the ideals of freedom for which we developed the GNU system.  It is "
+#| "also useful as a reminder for people in our community who know about "
+#| "these ideals, in a world where much of discussion of free software takes "
+#| "a totally practical (and thus amoral) approach.  When we ask you to call "
+#| "the system &ldquo;GNU/Linux&rdquo;, we are asking you to help in making "
+#| "the public aware of the free software ideals."
 msgid ""
 "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of "
 "the ideals of freedom for which we developed the GNU system.  It is also "
 "useful as a reminder for people in our community who know about these "
 "ideals, in a world where much of discussion of free software takes a totally "
 "practical (and thus amoral) approach.  When we ask you to call the system "
-"&ldquo;GNU/Linux&rdquo;, we are asking you to help in making the public "
+"&ldquo;GNU/Linux,&rdquo; we are asking you to help in making the public "
 "aware of the free software ideals."
 msgstr ""
 "Называя эту систему &ldquo;GNU/Linux&rdquo;, мы 
постепенно повышаем в "
@@ -138,6 +155,31 @@
 "Linux&rdquo;, мы просим вас помочь осведомлять 
общество об идеалах свободных "
 "программ."
 
+# type: Content of: <div><blockquote><p>
+#. type: Content of: <div><div><p>
+# | To learn more about this issue, you can also read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a> and our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>.-]
+# | {+System</a>.+}
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
+#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-"
+#| "gnu.html\">Linux and the GNU Project</a>."
+msgid ""
+"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
+"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>."
+msgstr ""
+"Чтобы узнать больше об этой проблеме, вы 
также можете прочитать нашу статью "
+"<a href=\"/gnu/gnu-linux-faq.html\">&ldquo;Вопросы о 
GNU/Linux&rdquo;</a>, "
+"нашу страницу <a 
href=\"/gnu/why-gnu-linux.html\">&ldquo;Почему GNU/Linux?"
+"&rdquo;</a>, а также нашу страницу <a 
href=\"/gnu/linux-and-gnu.html"
+"\">&ldquo;Linux и проект GNU&rdquo;</a>."
+
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -182,14 +224,13 @@
 "предложениям переводов наших статей см. в 
<a href=\"/server/standards/README."
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
-# type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2006, 2007, 2010, 2011, 2013-2015, 2017, 2019, 2021 Free "
-"Software Foundation, Inc."
+# | Copyright &copy; [-2014,-] {+2006,+} 2015, [-2016-] {+2021+} Free Software
+# | Foundation, Inc.
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -213,6 +254,14 @@
 msgid "Updated:"
 msgstr "Обновлено:"
 
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2006, 2007, 2010, 2011, 2013-2015, 2017, 2019, 2021 Free "
+#~ "Software Foundation, Inc."
+
 # type: Content of: <p>
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"

Index: gnu/po/gnu-users-never-heard-of-gnu.sq.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.sq.po,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- gnu/po/gnu-users-never-heard-of-gnu.sq.po   31 May 2021 11:30:23 -0000      
1.50
+++ gnu/po/gnu-users-never-heard-of-gnu.sq.po   30 Aug 2021 13:34:54 -0000      
1.51
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-05-01 11:52+0300\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: Shqip <besnik@programeshqip.org>\n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "X-Generator: Poedit 2.4.2\n"
 
 # type: Content of: <title>
@@ -26,35 +27,29 @@
 "Free Software Foundation"
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU Users Who Have Never Heard of&nbsp;GNU"
 msgstr "Përdorues të GNU-së Që Nuk Kanë Dëgjuar Kurrë për&nbsp; 
GNU-në"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "nga <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-# type: Content of: <div><blockquote><p>
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
-"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>."
-msgstr ""
-"Për të mësuar më tepër mbi këtë çështje, mund të lexoni edhe <a 
href=\"/gnu/"
-"gnu-linux-faq.html\">FAQ mbi GNU/Linux</a>, faqen tonë mbi <a href=\"/gnu/"
-"why-gnu-linux.html\">Pse GNU/Linux?</a> dhe faqen tonë mbi <a href=\"/gnu/"
-"linux-and-gnu.html\">Linux-in dhe Projektin GNU</a>."
-
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Most people have never heard of GNU.  Even most of the people who use the "
+#| "GNU system have never heard of GNU, since so many people and companies "
+#| "teach them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say "
+#| "they are &ldquo;running Linux&rdquo;, which is like saying you are &ldquo;"
+#| "driving your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
 msgid ""
 "Most people have never heard of GNU.  Even most of the people who use the "
 "GNU system have never heard of GNU, since so many people and companies teach "
-"them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say they are "
-"&ldquo;running Linux&rdquo;, which is like saying you are &ldquo;driving "
-"your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
+"them to call it &ldquo;Linux.&rdquo; Indeed, GNU users often say they are "
+"&ldquo;running Linux,&rdquo; which is like saying you are &ldquo;driving "
+"your carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;"
 msgstr ""
 "Shumica e njerëzve nuk kanë dëgjuar kurrë për GNU-në.  Madje dhe 
shumica e "
 "njerëzve që përdorin sistemin GNU nuk kanë dëgjuar kurrë për GNU-në, 
ngaqë "
@@ -64,7 +59,7 @@
 "&ldquo;ngisni trasmisionin&rdquo;."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonetheless, those who know about GNU associate it with the ideals of "
 "freedom of the free software movement.  That association is no accident; the "
@@ -77,7 +72,7 @@
 "kompjuteri dhe të kihet liri."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "A person seeing the name &ldquo;GNU&rdquo; for the first time in &ldquo;GNU/"
 "Linux&rdquo; won't immediately know what it represents, but has come one "
@@ -96,7 +91,7 @@
 "kërkojnë rreth GNU-së, do të zbulojnë idetë që mishëron GNU-ja."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If they don't search, they may encounter them anyway.  The <a href=\"/"
 "philosophy/open-source-misses-the-point.html\">&ldquo;open source&rdquo;</a> "
@@ -117,14 +112,23 @@
 "përdorues i sistemit GNU."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness "
+#| "of the ideals of freedom for which we developed the GNU system.  It is "
+#| "also useful as a reminder for people in our community who know about "
+#| "these ideals, in a world where much of discussion of free software takes "
+#| "a totally practical (and thus amoral) approach.  When we ask you to call "
+#| "the system &ldquo;GNU/Linux&rdquo;, we are asking you to help in making "
+#| "the public aware of the free software ideals."
 msgid ""
 "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of "
 "the ideals of freedom for which we developed the GNU system.  It is also "
 "useful as a reminder for people in our community who know about these "
 "ideals, in a world where much of discussion of free software takes a totally "
 "practical (and thus amoral) approach.  When we ask you to call the system "
-"&ldquo;GNU/Linux&rdquo;, we are asking you to help in making the public "
+"&ldquo;GNU/Linux,&rdquo; we are asking you to help in making the public "
 "aware of the free software ideals."
 msgstr ""
 "Parë në shtrirje kohore, quajtja e sistemit &ldquo;GNU/Linux&rdquo; përhap 
"
@@ -136,6 +140,25 @@
 "Linux&rdquo;, ju kërkojmë të ndihmoni në ndërgjegjësimin e publikut mbi 
"
 "idealet e software-it të lirë."
 
+# type: Content of: <div><blockquote><p>
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
+#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-"
+#| "gnu.html\">Linux and the GNU Project</a>."
+msgid ""
+"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
+"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>."
+msgstr ""
+"Për të mësuar më tepër mbi këtë çështje, mund të lexoni edhe <a 
href=\"/gnu/"
+"gnu-linux-faq.html\">FAQ mbi GNU/Linux</a>, faqen tonë mbi <a href=\"/gnu/"
+"why-gnu-linux.html\">Pse GNU/Linux?</a> dhe faqen tonë mbi <a href=\"/gnu/"
+"linux-and-gnu.html\">Linux-in dhe Projektin GNU</a>."
+
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -183,14 +206,12 @@
 "parashtrimin e përkthimeve të faqeve tona web, shihni <a href=\"/server/"
 "standards/README.translations.html\">README për përkthimet</a>."
 
-# type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc."
 msgstr ""
-"Të drejta kopjimi &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free "
-"Software Foundation, Inc."
+"Të drejta kopjimi &copy; 2014, 2015, 2016 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -212,3 +233,11 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "U përditësua më:"
+
+# type: Content of: <div><p>
+#~ msgid ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Të drejta kopjimi &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free "
+#~ "Software Foundation, Inc."

Index: gnu/po/gnu-users-never-heard-of-gnu.sr-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.sr-diff.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gnu/po/gnu-users-never-heard-of-gnu.sr-diff.html    31 May 2021 09:06:18 
-0000      1.10
+++ gnu/po/gnu-users-never-heard-of-gnu.sr-diff.html    30 Aug 2021 13:34:54 
-0000      1.11
@@ -10,41 +10,36 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;GNU Users Who Have Never Heard of GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/gnu/po/gnu-users-never-heard-of-gnu.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;GNU</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;GNU</em></ins></span> 
Users Who Have Never Heard <span class="removed"><del><strong>of GNU&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;GNU Users Who Have Never Heard <span class="removed"><del><strong>of 
GNU&lt;/h2&gt;
 
-&lt;p&gt;&lt;strong&gt;by</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU&lt;/h2&gt;
+&lt;p&gt;&lt;strong&gt;by &lt;a href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
-&lt;address class="byline c"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
-<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;
-
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;To</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;To</em></ins></span> learn more about 
this issue, you can also read
+  &lt;blockquote&gt;&lt;p&gt;To learn more about this issue, you can also read
 our &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;, our page 
on 
 &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt; 
-and our page on &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU 
Project&lt;/a&gt;.
-<span 
class="removed"><del><strong>&lt;/p&gt;&lt;/blockquote&gt;</strong></del></span>
-<span class="inserted"><ins><em>&lt;/p&gt;</em></ins></span>
-&lt;/div&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;
+and our page on</strong></del></span> <span 
class="inserted"><ins><em>of&nbsp;GNU&lt;/h2&gt;
+
+&lt;address class="byline"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="/gnu/linux-and-gnu.html"&gt;Linux and the 
GNU Project&lt;/a&gt;.
+&lt;/p&gt;&lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;Most people have never heard of GNU.  Even most of the people who
 use the GNU system have never heard of GNU, <span 
class="removed"><del><strong>thanks to</strong></del></span> <span 
class="inserted"><ins><em>since</em></ins></span> so many people and
-companies <span class="removed"><del><strong>who</strong></del></span> teach 
them to call it &ldquo;Linux&rdquo;.  <span 
class="removed"><del><strong>Nonetheless,
-the name</strong></del></span>  <span 
class="inserted"><ins><em>Indeed,</em></ins></span> GNU <span 
class="removed"><del><strong>has certain associations, which people will 
discover once</strong></del></span>
-<span class="inserted"><ins><em>users often say</em></ins></span> they <span 
class="removed"><del><strong>hear the name.  GNU</strong></del></span> <span 
class="inserted"><ins><em>are &ldquo;running Linux&rdquo;, 
which</em></ins></span> is <span 
class="removed"><del><strong>associated</strong></del></span> <span 
class="inserted"><ins><em>like
+companies <span class="removed"><del><strong>who</strong></del></span> teach 
them to call it <span class="removed"><del><strong>&ldquo;Linux&rdquo;.  
Nonetheless,
+the name</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;Linux.&rdquo;  Indeed,</em></ins></span> GNU 
<span class="removed"><del><strong>has certain associations, which people will 
discover once</strong></del></span>
+<span class="inserted"><ins><em>users often say</em></ins></span> they <span 
class="removed"><del><strong>hear the name.  GNU</strong></del></span> <span 
class="inserted"><ins><em>are &ldquo;running Linux,&rdquo; 
which</em></ins></span> is <span 
class="removed"><del><strong>associated</strong></del></span> <span 
class="inserted"><ins><em>like
 saying you are &ldquo;driving your carburetor&rdquo; or
-&ldquo;driving your transmission&rdquo;.&lt;/p&gt;
+&ldquo;driving your transmission.&rdquo;&lt;/p&gt;
 
 &lt;p&gt;Nonetheless, those who know about GNU associate it</em></ins></span> 
with the ideals
 of freedom of the free software movement.  That association is no
@@ -64,9 +59,9 @@
 href="http://www.gnu.org"&gt;www.gnu.org&lt;/a&gt;, which talks about free
 software and freedom.&lt;/p&gt;
 
-&lt;p&gt;A person seeing the name &ldquo;GNU&rdquo; for</strong></del></span> 
the <span class="removed"><del><strong>first time in
+&lt;p&gt;A person seeing the name &ldquo;GNU&rdquo; for the first time in
 &ldquo;GNU/Linux&rdquo; won't immediately associate it with anything.
-However, when people know that the system is basically GNU, that brings
+However, when people know that</strong></del></span> the <span 
class="removed"><del><strong>system is basically GNU, that brings
 them a step closer to learning about our ideals.  For instance, they
 might become curious and look for more information about 
GNU.&lt;/p&gt;</strong></del></span> <span class="inserted"><ins><em>ideas GNU 
stands for.&lt;/p&gt;</em></ins></span>
 
@@ -86,10 +81,19 @@
 system.  It is also useful as a reminder for people in our community
 who know about these ideals, in a world where much of discussion of
 free software takes a totally practical (and thus amoral) approach.
-When we ask you to call the system &ldquo;GNU/Linux&rdquo;, we <span 
class="removed"><del><strong>do so because
+When we ask you to call the system <span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;,</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU/Linux,&rdquo;</em></ins></span> we 
<span class="removed"><del><strong>do so because
 awareness of GNU slowly but surely brings with it 
awareness</strong></del></span> <span class="inserted"><ins><em>are
-asking you to help in making the public aware</em></ins></span> of the free 
software <span class="removed"><del><strong>ideals of freedom and 
community.&lt;/p&gt;</strong></del></span>
+asking you to help in making the public aware</em></ins></span> of the free 
software <span class="removed"><del><strong>ideals of 
freedom</strong></del></span>
 <span class="inserted"><ins><em>ideals.&lt;/p&gt;
+
+&lt;div class="announcement comment" role="complementary"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;p&gt;To learn more about this issue, you can also read
+our &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;, our page 
on 
+&lt;a href="/gnu/why-gnu-linux.html"&gt;Why 
GNU/Linux?&lt;/a&gt;</em></ins></span> 
+and <span 
class="removed"><del><strong>community.&lt;/p&gt;</strong></del></span> <span 
class="inserted"><ins><em>our page on &lt;a 
href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU System&lt;/a&gt;.
+&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
 &lt;/div&gt;
 &lt;/div&gt;</em></ins></span>
 
@@ -140,7 +144,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2006, 2007, <span class="removed"><del><strong>2013, 
2014</strong></del></span> <span class="inserted"><ins><em>2013-2015, 2017, 
2019, 2021</em></ins></span> Free Software
+&lt;p&gt;Copyright &copy; 2006, <span class="removed"><del><strong>2007, 2013, 
2014</strong></del></span> <span class="inserted"><ins><em>2015, 
2021</em></ins></span> Free Software
 Foundation, Inc.&lt;/p&gt;
 
 &lt;p&gt;This page is licensed under a &lt;a rel="license"
@@ -152,11 +156,12 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/31 09:06:18 $
+$Date: 2021/08/30 13:34:54 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-&lt;/div&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for class="inner", starts 
in the banner include --&gt;</em></ins></span>
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>

Index: gnu/po/gnu-users-never-heard-of-gnu.sr.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.sr.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- gnu/po/gnu-users-never-heard-of-gnu.sr.po   31 May 2021 09:06:18 -0000      
1.27
+++ gnu/po/gnu-users-never-heard-of-gnu.sr.po   30 Aug 2021 13:34:54 -0000      
1.28
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2011-09-09 15:16+0200\n"
 "Last-Translator: Strahinya Radich <vilinkamen@mail.ru>\n"
 "Language-Team: Serbian <www-sr-dev@lists.gnu.org>\n"
@@ -28,38 +28,26 @@
 "ГНУ корисници који никада нису чули о ГНУ 
— Пројекат ГНУ — Задужбина за "
 "слободни софтвер"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 #, fuzzy
 #| msgid "GNU Users Who Have Never Heard of GNU"
 msgid "GNU Users Who Have Never Heard of&nbsp;GNU"
 msgstr "ГНУ корисници који никада нису чули о 
ГНУ"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 #, fuzzy
 #| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "од <a href=\"http://www.stallman.org/\";>Ричарда 
Сталмана</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
-"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>."
-msgstr ""
-"Да бисте научили више о овој теми, можете 
прочитати <a href=\"/gnu/gnu-linux-"
-"faq.html\">ГНУ са Линуксом ЧПП (Честа 
Постављана Питања)</a>, страну <a href="
-"\"/gnu/why-gnu-linux.html\">Зашто ГНУ са Линуксом?</a> и 
нашу страну о  <a "
-"href=\"/gnu/linux-and-gnu.html\">Линукс и Пројекат ГНУ</a>."
-
 # | Most people have never heard of GNU.  Even most of the people who use the
 # | GNU system have never heard of GNU, [-thanks to-] {+since+} so many people
 # | and companies [-who-] teach them to call it &ldquo;Linux&rdquo;. 
 # | {+Indeed, GNU users often say they are &ldquo;running Linux&rdquo;, which
 # | is like saying you are &ldquo;driving your carburetor&rdquo; or
 # | &ldquo;driving your transmission&rdquo;.+}
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "Most people have never heard of GNU.  Even most of the people who use the "
@@ -68,9 +56,9 @@
 msgid ""
 "Most people have never heard of GNU.  Even most of the people who use the "
 "GNU system have never heard of GNU, since so many people and companies teach "
-"them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say they are "
-"&ldquo;running Linux&rdquo;, which is like saying you are &ldquo;driving "
-"your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
+"them to call it &ldquo;Linux.&rdquo; Indeed, GNU users often say they are "
+"&ldquo;running Linux,&rdquo; which is like saying you are &ldquo;driving "
+"your carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;"
 msgstr ""
 "Већина људи никада није чуло за ГНУ. Чак 
већина људи који користе ГНУ систем "
 "никада нису чули за ГНУ, захваљујући 
многим људима и компанијама које их уче "
@@ -82,7 +70,7 @@
 # | software movement.  That association is no accident; the motive for
 # | developing GNU was specifically to make it possible to use a computer and
 # | have freedom.
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "Nonetheless, the name GNU has certain associations, which people will "
@@ -115,7 +103,7 @@
 # | the system is basically GNU, that brings them a step closer to learning
 # | about our ideals.  For instance, they might become curious and look for
 # | more information about GNU.-] {+ideas GNU stands for.+}
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "The association between the name GNU and our goals of freedom and social "
@@ -160,7 +148,7 @@
 # | attention to information about GNU (such as that it's the work of a
 # | campaign for freedom and community) if [-he knows he is a user-] {+they
 # | know they are users+} of the GNU system.
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "If they don't look for it, they may encounter it anyway.  The &ldquo;open "
@@ -196,7 +184,7 @@
 # | but surely brings with it awareness-] {+are asking you to help in making
 # | the public aware+} of the free software [-ideals of freedom and
 # | community.-] {+ideals.+}
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness "
@@ -213,7 +201,7 @@
 "useful as a reminder for people in our community who know about these "
 "ideals, in a world where much of discussion of free software takes a totally "
 "practical (and thus amoral) approach.  When we ask you to call the system "
-"&ldquo;GNU/Linux&rdquo;, we are asking you to help in making the public "
+"&ldquo;GNU/Linux,&rdquo; we are asking you to help in making the public "
 "aware of the free software ideals."
 msgstr ""
 "Временом, називати систем &ldquo;ГНУ са 
Линуксом&rdquo; ће проширити свест о "
@@ -224,6 +212,24 @@
 "Линуксом&rdquo;, ми то радимо зато што свест о 
ГНУ полако али сигурно доноси "
 "са собом свест о идеалима слободног 
софтвера - слободе и заједнице."
 
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
+#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-"
+#| "gnu.html\">Linux and the GNU Project</a>."
+msgid ""
+"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
+"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>."
+msgstr ""
+"Да бисте научили више о овој теми, можете 
прочитати <a href=\"/gnu/gnu-linux-"
+"faq.html\">ГНУ са Линуксом ЧПП (Честа 
Постављана Питања)</a>, страну <a href="
+"\"/gnu/why-gnu-linux.html\">Зашто ГНУ са Линуксом?</a> и 
нашу страну о  <a "
+"href=\"/gnu/linux-and-gnu.html\">Линукс и Пројекат ГНУ</a>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -270,18 +276,16 @@
 "\">ПРОЧИТАЈМЕ за преводе</a> за више 
информација о координисању и слању "
 "превода овог чланка."
 
-# | Copyright &copy; 2006, 2007, 2013, [-2014-] {+2014, 2015, 2017, 2019+}
-# | Free Software Foundation, Inc.
+# type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
-#| "Copyright &copy; 2006, 2007, 2013, 2014 Free Software Foundation, Inc."
-msgid ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
+#| "Copyright &copy; 2004, 2005, 2006, 2007, 2008, 2009 Free Software "
+#| "Foundation, Inc."
+msgid "Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc."
 msgstr ""
-"<b>Ауторска права:</b><br />Copyright &copy; 2006, 2007, 2013, 
2014 Free "
-"Software Foundation, Inc."
+"<b>Ауторска права:</b><br />Copyright &copy; 2004, 2005, 2006, 
2007, 2008, "
+"2009 Free Software Foundation, Inc.,"
 
 #. type: Content of: <div><p>
 msgid ""
@@ -305,6 +309,18 @@
 msgid "Updated:"
 msgstr "Ажурирано:"
 
+# | Copyright &copy; 2006, 2007, 2013, [-2014-] {+2014, 2015, 2017, 2019+}
+# | Free Software Foundation, Inc.
+#, fuzzy
+#~| msgid ""
+#~| "Copyright &copy; 2006, 2007, 2013, 2014 Free Software Foundation, Inc."
+#~ msgid ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "<b>Ауторска права:</b><br />Copyright &copy; 2006, 2007, 
2013, 2014 Free "
+#~ "Software Foundation, Inc."
+
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"

Index: gnu/po/gnu-users-never-heard-of-gnu.tr.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.tr.po,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- gnu/po/gnu-users-never-heard-of-gnu.tr.po   10 Apr 2021 06:36:40 -0000      
1.38
+++ gnu/po/gnu-users-never-heard-of-gnu.tr.po   30 Aug 2021 13:34:54 -0000      
1.39
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-04-10 08:31+0200\n"
 "Last-Translator: T. E. Kalayci <tekrei@member.fsf.org>\n"
 "Language-Team: Turkish <www-tr-comm@gnu.org>\n"
@@ -19,6 +19,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.4.2\n"
 
@@ -30,33 +31,28 @@
 "GNU'yu hiç duymamış olan GNU kullanıcıları - GNU Projesi - Özgür 
Yazılım "
 "Vakfı"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU Users Who Have Never Heard of&nbsp;GNU"
 msgstr "GNU'yu hiç duymamış olan GNU kullanıcıları"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "yazan <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
-"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>."
-msgstr ""
-"Bu konuda daha fazla bilgi için, <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux SSS</a> ve <a href=\"/gnu/why-gnu-linux.html\">Neden GNU/Linux</a> "
-"sayfamıza ve ayrıca <a href=\"/gnu/linux-and-gnu.html\">Linux ve GNU "
-"Projesi</a> sayfamıza göz atabilirsiniz."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Most people have never heard of GNU.  Even most of the people who use the "
+#| "GNU system have never heard of GNU, since so many people and companies "
+#| "teach them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say "
+#| "they are &ldquo;running Linux&rdquo;, which is like saying you are &ldquo;"
+#| "driving your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
 msgid ""
 "Most people have never heard of GNU.  Even most of the people who use the "
 "GNU system have never heard of GNU, since so many people and companies teach "
-"them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say they are "
-"&ldquo;running Linux&rdquo;, which is like saying you are &ldquo;driving "
-"your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
+"them to call it &ldquo;Linux.&rdquo; Indeed, GNU users often say they are "
+"&ldquo;running Linux,&rdquo; which is like saying you are &ldquo;driving "
+"your carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;"
 msgstr ""
 "Çoğu insan, GNU'yu hiç duymamıştır. GNU sistemini kullanan çoğu insan 
bile "
 "GNU'yu duymamıştır, çünkü çoğu kişi ve şirket onlara sistemi 
&ldquo;"
@@ -65,7 +61,7 @@
 "karbüratör kullandığınızı&rdquo; veya &ldquo;vites&rdquo; 
kullandığınızı "
 "söylemek gibi bir şey."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonetheless, those who know about GNU associate it with the ideals of "
 "freedom of the free software movement.  That association is no accident; the "
@@ -77,7 +73,7 @@
 "geliştirilmesini güdüleyen şey, bir bilgisayarın kullanmayı ve bu işi "
 "özgürce yapmanızı sağlamaktır."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "A person seeing the name &ldquo;GNU&rdquo; for the first time in &ldquo;GNU/"
 "Linux&rdquo; won't immediately know what it represents, but has come one "
@@ -96,7 +92,7 @@
 "kullanıcılar GNU kelimesini aratırlarsa, GNU'nun temsil ettiği değerleri 
"
 "bulacaklardır."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If they don't search, they may encounter them anyway.  The <a href=\"/"
 "philosophy/open-source-misses-the-point.html\">&ldquo;open source&rdquo;</a> "
@@ -116,14 +112,23 @@
 "GNU hakkındaki (özgürlük ve topluluk üzerine bir kampanya çalışması 
gibi) "
 "bilgiler daha fazla dikkatlerini çekecektir."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness "
+#| "of the ideals of freedom for which we developed the GNU system.  It is "
+#| "also useful as a reminder for people in our community who know about "
+#| "these ideals, in a world where much of discussion of free software takes "
+#| "a totally practical (and thus amoral) approach.  When we ask you to call "
+#| "the system &ldquo;GNU/Linux&rdquo;, we are asking you to help in making "
+#| "the public aware of the free software ideals."
 msgid ""
 "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of "
 "the ideals of freedom for which we developed the GNU system.  It is also "
 "useful as a reminder for people in our community who know about these "
 "ideals, in a world where much of discussion of free software takes a totally "
 "practical (and thus amoral) approach.  When we ask you to call the system "
-"&ldquo;GNU/Linux&rdquo;, we are asking you to help in making the public "
+"&ldquo;GNU/Linux,&rdquo; we are asking you to help in making the public "
 "aware of the free software ideals."
 msgstr ""
 "Zamanla, sistemi &ldquo;GNU/Linux&rdquo; olarak adlandırmak, GNU sistemini "
@@ -135,6 +140,24 @@
 "istediğimizde, toplumun özgür yazılım amaçlarının farkına varmasına 
yardım "
 "etmenizi istemiş oluyoruz."
 
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
+#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-"
+#| "gnu.html\">Linux and the GNU Project</a>."
+msgid ""
+"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
+"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>."
+msgstr ""
+"Bu konuda daha fazla bilgi için, <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux SSS</a> ve <a href=\"/gnu/why-gnu-linux.html\">Neden GNU/Linux</a> "
+"sayfamıza ve ayrıca <a href=\"/gnu/linux-and-gnu.html\">Linux ve GNU "
+"Projesi</a> sayfamıza göz atabilirsiniz."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -182,12 +205,10 @@
 "\">çalışma&nbsp;sayfamızı</a> ziyaret edebilirsiniz."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2014-2021 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2014-2021 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -222,6 +243,13 @@
 msgstr "Son Güncelleme:"
 
 #~ msgid ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+
+#~ msgid ""
 #~ "A person seeing the name &ldquo;GNU&rdquo; for the first time in &ldquo;"
 #~ "GNU/Linux&rdquo; won't immediately associate it with anything.  However, "
 #~ "when people know that the system is basically GNU, that brings them a "

Index: gnu/po/gnu-users-never-heard-of-gnu.uk.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.uk.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- gnu/po/gnu-users-never-heard-of-gnu.uk.po   31 May 2021 20:31:28 -0000      
1.18
+++ gnu/po/gnu-users-never-heard-of-gnu.uk.po   30 Aug 2021 13:34:54 -0000      
1.19
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2017-12-10 14:52+0200\n"
 "Last-Translator: Andriy Bandura <andriykopanytsia@gmail.com>\n"
 "Language-Team: Ukrainian <>\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-08-30 13:26+0000\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 2.0\n"
@@ -28,34 +29,28 @@
 "Користувачі GNU, які ніколи не чули про GNU - 
Проект GNU - Фонд вільного "
 "програмного забезпечення"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU Users Who Have Never Heard of&nbsp;GNU"
 msgstr "Користувачі GNU, які ніколи не чули 
про&nbsp;GNU"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"https://www.stallman.org/\";>Річард Столмен</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
-"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>."
-msgstr ""
-"Щоб дізнатися більше про цю проблему, ви 
також можете прочитати нашу статтю "
-"<a href=\"/gnu/gnu-linux-faq.html\">&ldquo;Питання про 
GNU/Linux&raquo;,</a> "
-"нашу сторінку <a href=\"/gnu/why-gnu-linux.html\">&ldquo;Чому 
GNU/Linux? "
-"&raquo;,</a>, а також нашу сторінку <a 
href=\"/gnu/linux-and-gnu.html"
-"\">&ldquo;Linux і проект GNU&raquo;,</a>."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Most people have never heard of GNU.  Even most of the people who use the "
+#| "GNU system have never heard of GNU, since so many people and companies "
+#| "teach them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say "
+#| "they are &ldquo;running Linux&rdquo;, which is like saying you are &ldquo;"
+#| "driving your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
 msgid ""
 "Most people have never heard of GNU.  Even most of the people who use the "
 "GNU system have never heard of GNU, since so many people and companies teach "
-"them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say they are "
-"&ldquo;running Linux&rdquo;, which is like saying you are &ldquo;driving "
-"your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
+"them to call it &ldquo;Linux.&rdquo; Indeed, GNU users often say they are "
+"&ldquo;running Linux,&rdquo; which is like saying you are &ldquo;driving "
+"your carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;"
 msgstr ""
 "Більшість людей ніколи не чули про GNU. 
Навіть більшість людей, "
 "використовують систему GNU, ніколи не чули 
про GNU, оскільки так багато "
@@ -64,7 +59,7 @@
 "все одно що говорити, що ви &ldquo;їдете на 
карбюраторі&rdquo; &ldquo;їдете "
 "на коробці передач&rdquo;."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonetheless, those who know about GNU associate it with the ideals of "
 "freedom of the free software movement.  That association is no accident; the "
@@ -75,7 +70,7 @@
 "вільні програми. Цей зв'язок не випадкова; 
мотивом розробки GNU було саме "
 "створення можливості користуватися 
комп'ютером, володіючи свободою."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "A person seeing the name &ldquo;GNU&rdquo; for the first time in &ldquo;GNU/"
 "Linux&rdquo; won't immediately know what it represents, but has come one "
@@ -93,7 +88,7 @@
 "Вікіпедії. Вона існує у Всесвітній 
павутині; якщо користувачі стануть шукати "
 "GNU, вони знайдуть ідеї, на яких базується 
GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If they don't search, they may encounter them anyway.  The <a href=\"/"
 "philosophy/open-source-misses-the-point.html\">&ldquo;open source&rdquo;</a> "
@@ -113,14 +108,23 @@
 "(наприклад, про те, що це робота руху за 
свободу і єдність), якщо вони "
 "знають, що вони користуються системою GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness "
+#| "of the ideals of freedom for which we developed the GNU system.  It is "
+#| "also useful as a reminder for people in our community who know about "
+#| "these ideals, in a world where much of discussion of free software takes "
+#| "a totally practical (and thus amoral) approach.  When we ask you to call "
+#| "the system &ldquo;GNU/Linux&rdquo;, we are asking you to help in making "
+#| "the public aware of the free software ideals."
 msgid ""
 "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of "
 "the ideals of freedom for which we developed the GNU system.  It is also "
 "useful as a reminder for people in our community who know about these "
 "ideals, in a world where much of discussion of free software takes a totally "
 "practical (and thus amoral) approach.  When we ask you to call the system "
-"&ldquo;GNU/Linux&rdquo;, we are asking you to help in making the public "
+"&ldquo;GNU/Linux,&rdquo; we are asking you to help in making the public "
 "aware of the free software ideals."
 msgstr ""
 "Називаючи цю систему &ldquo;GNU/Linux&rdquo;, ми 
поступово підвищуємо "
@@ -131,6 +135,25 @@
 "просимо вас називати систему 
&ldquo;GNU/Linux&rdquo;, ми просимо вас "
 "допомогти інформувати суспільство про 
ідеали вільних програм."
 
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
+#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-"
+#| "gnu.html\">Linux and the GNU Project</a>."
+msgid ""
+"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
+"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>."
+msgstr ""
+"Щоб дізнатися більше про цю проблему, ви 
також можете прочитати нашу статтю "
+"<a href=\"/gnu/gnu-linux-faq.html\">&ldquo;Питання про 
GNU/Linux&raquo;,</a> "
+"нашу сторінку <a href=\"/gnu/why-gnu-linux.html\">&ldquo;Чому 
GNU/Linux? "
+"&raquo;,</a>, а також нашу сторінку <a 
href=\"/gnu/linux-and-gnu.html"
+"\">&ldquo;Linux і проект GNU&raquo;,</a>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -175,12 +198,11 @@
 "translations.html\">&ldquo;Посібнику з 
перекладу&rdquo;</a>."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2014, 2015 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc."
 msgstr ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc. (Фонд вільного програмного 
забезпечення, Inc.)"
+"Copyright &copy; 2014, 2015 Фонд вільного програмного 
забезпечення, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -205,6 +227,13 @@
 msgstr "Оновлено:"
 
 #~ msgid ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc. (Фонд вільного програмного 
забезпечення, Inc.)"
+
+#~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"
 #~ msgstr ""

Index: gnu/po/gnu-users-never-heard-of-gnu.zh-cn.po
===================================================================
RCS file: /web/www/www/gnu/po/gnu-users-never-heard-of-gnu.zh-cn.po,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gnu/po/gnu-users-never-heard-of-gnu.zh-cn.po        12 Apr 2021 07:33:48 
-0000      1.7
+++ gnu/po/gnu-users-never-heard-of-gnu.zh-cn.po        30 Aug 2021 13:34:54 
-0000      1.8
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnu-users-never-heard-of-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-04-12 15:02+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 
 #. type: Content of: <title>
 msgid ""
@@ -21,41 +22,36 @@
 "Foundation"
 msgstr "从未听说过 GNU 的 GNU 用户 - GNU 工程 - 
自由软件基金会"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "GNU Users Who Have Never Heard of&nbsp;GNU"
 msgstr "从未听说过 GNU 的 GNU 用户"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"https://www.stallman.org/\";>理查德·斯托曼</a> 著"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
-"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>."
-msgstr ""
-"如需了解此问题的更多信息,你可以阅读我们的<a 
href=\"/gnu/gnu-linux-faq.html"
-"\">GNU/Linux问答</a>、我们关于<a 
href=\"/gnu/why-gnu-linux.html\">为什么应该"
-"叫做GNU/Linux?</a>的页面以及我们的<a 
href=\"/gnu/linux-and-gnu.html\">Linux"
-"和GNU工程</a>页面。"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Most people have never heard of GNU.  Even most of the people who use the "
+#| "GNU system have never heard of GNU, since so many people and companies "
+#| "teach them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say "
+#| "they are &ldquo;running Linux&rdquo;, which is like saying you are &ldquo;"
+#| "driving your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
 msgid ""
 "Most people have never heard of GNU.  Even most of the people who use the "
 "GNU system have never heard of GNU, since so many people and companies teach "
-"them to call it &ldquo;Linux&rdquo;.  Indeed, GNU users often say they are "
-"&ldquo;running Linux&rdquo;, which is like saying you are &ldquo;driving "
-"your carburetor&rdquo; or &ldquo;driving your transmission&rdquo;."
+"them to call it &ldquo;Linux.&rdquo; Indeed, GNU users often say they are "
+"&ldquo;running Linux,&rdquo; which is like saying you are &ldquo;driving "
+"your carburetor&rdquo; or &ldquo;driving your transmission.&rdquo;"
 msgstr ""
 
"大多数人从未听说过GNU。甚至大多数使用GNU系统的人都从未听说过GNU,å›
 ä¸ºå¦‚此众多"
 "的人和å…
¬å¸æ•™ç»™ä»–们的名字是&ldquo;Linux&rdquo;。确实,GNU用户经常说他们&ldquo;"
 "运行的是Linux&rdquo;,这就像是在说你
开车是&ldquo;驾驶化油器&rdquo;或者是"
 "&ldquo;驾驶变速箱&rdquo;。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Nonetheless, those who know about GNU associate it with the ideals of "
 "freedom of the free software movement.  That association is no accident; the "
@@ -65,7 +61,7 @@
 
"尽管如此,那些了解GNU的人会把它和自由软件运动的自由理想联系在一起。这种联系不"
 
"是巧合;开发GNU的动机正是让人们能够使用电脑并拥有自由。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "A person seeing the name &ldquo;GNU&rdquo; for the first time in &ldquo;GNU/"
 "Linux&rdquo; won't immediately know what it represents, but has come one "
@@ -81,7 +77,7 @@
 
"home.html\">gnu.org</a>和Wikipedia中。它存在于网络中;如果这些用户搜索GNU一"
 "词,他们就会发现GNU代表的思想。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If they don't search, they may encounter them anyway.  The <a href=\"/"
 "philosophy/open-source-misses-the-point.html\">&ldquo;open source&rdquo;</a> "
@@ -98,14 +94,23 @@
 
"这些思想。此时,如果人们知道自己是GNU系统的用户的话,他们就更有可能注意到å
…³äºŽ"
 "GNU的信息(比如说它是一个自由和社区运动的作品)。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness "
+#| "of the ideals of freedom for which we developed the GNU system.  It is "
+#| "also useful as a reminder for people in our community who know about "
+#| "these ideals, in a world where much of discussion of free software takes "
+#| "a totally practical (and thus amoral) approach.  When we ask you to call "
+#| "the system &ldquo;GNU/Linux&rdquo;, we are asking you to help in making "
+#| "the public aware of the free software ideals."
 msgid ""
 "Over time, calling the system &ldquo;GNU/Linux&rdquo; spreads awareness of "
 "the ideals of freedom for which we developed the GNU system.  It is also "
 "useful as a reminder for people in our community who know about these "
 "ideals, in a world where much of discussion of free software takes a totally "
 "practical (and thus amoral) approach.  When we ask you to call the system "
-"&ldquo;GNU/Linux&rdquo;, we are asking you to help in making the public "
+"&ldquo;GNU/Linux,&rdquo; we are asking you to help in making the public "
 "aware of the free software ideals."
 msgstr ""
 
"随着时间的发展,称该系统为&ldquo;GNU/Linux&rdquo;就会让更多的人对我们开发GNU"
@@ -114,6 +119,24 @@
 "道德无关)的角度出发的。当我们请求你
称该系统为&ldquo;GNU/Linux&rdquo;时,我们"
 "就是在请求你帮助我们让公众了解自由软件的理想。"
 
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
+#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-"
+#| "gnu.html\">Linux and the GNU Project</a>."
+msgid ""
+"To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-linux."
+"html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>."
+msgstr ""
+"如需了解此问题的更多信息,你可以阅读我们的<a 
href=\"/gnu/gnu-linux-faq.html"
+"\">GNU/Linux问答</a>、我们关于<a 
href=\"/gnu/why-gnu-linux.html\">为什么应该"
+"叫做GNU/Linux?</a>的页面以及我们的<a 
href=\"/gnu/linux-and-gnu.html\">Linux"
+"和GNU工程</a>页面。"
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -153,13 +176,12 @@
 "请参考 <a 
href=\"/server/standards/README.translations.html\">翻译说明</a> 了"
 "解有关协调和提交文章翻译的信息。"
 
+# type: Content of: <div><p>
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
-msgstr ""
-"Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
-"Foundation, Inc."
+#, fuzzy
+#| msgid "Copyright &copy; 2011, 2012 Free Software Foundation, Inc."
+msgid "Copyright &copy; 2006, 2015, 2021 Free Software Foundation, Inc."
+msgstr "Copyright &copy; 2011 Free Software Foundation, Inc."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -184,6 +206,13 @@
 msgstr "最后更新:"
 
 #~ msgid ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+#~ msgstr ""
+#~ "Copyright &copy; 2006, 2007, 2013-2015, 2017, 2019, 2021 Free Software "
+#~ "Foundation, Inc."
+
+#~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"
 #~ msgstr ""

Index: gnu/po/linux-and-gnu.ar-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ar-diff.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gnu/po/linux-and-gnu.ar-diff.html   30 May 2021 18:01:56 -0000      1.8
+++ gnu/po/linux-and-gnu.ar-diff.html   30 Aug 2021 13:34:54 -0000      1.9
@@ -10,44 +10,49 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.79</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.79</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;Linux and GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU 
HURD, Hurd" /&gt;
 &lt;meta http-equiv="Description" content="Since 1983, developing the free 
Unix style operating system GNU, so that computer users can have the freedom to 
share and improve the software they use." /&gt;
 &lt;!--#include virtual="/gnu/po/linux-and-gnu.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;Linux</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;Linux</em></ins></span> 
and the GNU System&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;Linux and the GNU System&lt;/h2&gt;
 
-<span 
class="removed"><del><strong>&lt;p&gt;&lt;strong&gt;by</strong></del></span>
+<span class="removed"><del><strong>&lt;p&gt;&lt;strong&gt;by &lt;a 
href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;address class="byline 
c"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
-<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;
-
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;For</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;For</em></ins></span> more 
information see also
-the &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;,
+  &lt;blockquote&gt;&lt;p&gt;For more information see also
+the</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;address 
class="byline"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux 
FAQ&lt;/a&gt;,
 and &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;&lt;/p&gt;
-  <span class="removed"><del><strong>&lt;/blockquote&gt;</strong></del></span>
-&lt;/div&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;
+  &lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;
 Many computer users run a modified version of
 &lt;a href="/philosophy/categories.html#TheGNUsystem"&gt;the GNU 
system&lt;/a&gt;
 every day, without realizing it.  Through a peculiar turn of events,
 the version of GNU which is widely used today is often called
-&ldquo;Linux&rdquo;, and many of its users
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> and 
many of its users
 are &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt; not aware&lt;/a&gt;
 that it is basically the GNU system, developed by the
 &lt;a href="/gnu/gnu-history.html"&gt;GNU Project&lt;/a&gt;.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;div class="announcement comment" 
role="complementary"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;p&gt;For more information see also
+the &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;,
+and &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;</em></ins></span>
+
 &lt;p&gt;
 There really is a Linux, and these people are using it, but it is just
 a part of the system they use.  Linux is the kernel: the program in
@@ -63,7 +68,8 @@
 &lt;p&gt;
 Many users do not understand the difference between the kernel, which
 is Linux, and the whole system, which they also call
-&ldquo;Linux&rdquo;.  The ambiguous use of the name doesn't help
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  The 
ambiguous use of the name doesn't help
 people understand.  These users often think that Linus Torvalds
 developed the whole operating system in 1991, with a bit of help.&lt;/p&gt;
 
@@ -100,7 +106,8 @@
 &lt;p&gt;
 If we tried to measure the GNU Project's contribution in this way,
 what would we conclude?  One CD-ROM vendor found that in their &ldquo;Linux
-distribution&rdquo;, &lt;a 
href="/philosophy/categories.html#GNUsoftware"&gt;GNU
+<span class="removed"><del><strong>distribution&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>distribution,&rdquo;</em></ins></span> &lt;a 
href="/philosophy/categories.html#GNUsoftware"&gt;GNU
 software&lt;/a&gt; was the largest single contingent, around 28% of the
 total source code, and this included some of the essential major
 components without which there could be no system.  Linux itself was
@@ -108,7 +115,7 @@
 repository of gNewSense, Linux is 1.5% and GNU packages are 15%.)
 So if you were going to pick a name for the system based on
 who wrote the programs in the system, the most appropriate single
-choice would be &ldquo;GNU&rdquo;.&lt;/p&gt;
+choice would be <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU.&rdquo;&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
 But that is not the deepest way to consider the question.  The GNU
@@ -147,7 +154,7 @@
 Fortunately, we didn't have to wait for the Hurd, because of Linux.
 Once Torvalds freed Linux in 1992, it fit into the last major gap in
 the GNU system.  People could
-then &lt;a 
href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+then &lt;a <span 
class="removed"><del><strong>href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
 combine Linux with the GNU system&lt;/a&gt; to make a complete free system
 &mdash; a version of the GNU system which also contained Linux.  The
 GNU/Linux system, in other words.&lt;/p&gt;
@@ -165,7 +172,7 @@
 
 &lt;p&gt;
 The GNU Project supports GNU/Linux systems as well as &lt;em&gt;the&lt;/em&gt; 
GNU
-system.  The &lt;a href="http://fsf.org/"&gt;FSF&lt;/a&gt; funded the 
rewriting of
+system.  The &lt;a <span 
class="removed"><del><strong>href="http://fsf.org/"&gt;FSF&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://fsf.org/"&gt;FSF&lt;/a&gt;</em></ins></span>
 funded the rewriting of
 the Linux-related extensions to the GNU C library, so that now they
 are well integrated, and the newest GNU/Linux systems use the current
 library release with no changes.  The FSF also funded an early stage
@@ -189,7 +196,7 @@
 be loaded into I/O devices when the system starts, and they are
 included, as long series of numbers, in the "source code" of Linux.
 Thus, maintaining free GNU/Linux distributions now entails maintaining
-a &lt;a href="http://directory.fsf.org/project/linux"&gt; free version of
+a &lt;a <span 
class="removed"><del><strong>href="http://directory.fsf.org/project/linux"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://directory.fsf.org/project/linux"&gt;</em></ins></span>
 free version of
 Linux&lt;/a&gt; too.&lt;/p&gt;
 
 &lt;p&gt;Whether you use GNU/Linux or not, please don't confuse the public
@@ -197,14 +204,16 @@
 kernel, one of the essential major components of the system.  The
 system as a whole is basically the GNU system, with Linux added.  When
 you're talking about this combination, please call it
-&ldquo;GNU/Linux&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.&lt;/p&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
 If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
 reference, this page and &lt;a href="/gnu/the-gnu-project.html"&gt;
-http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt; are good choices.  If
+<span 
class="removed"><del><strong>http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>https://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</em></ins></span>
 are good choices.  If
 you mention Linux, the kernel, and want to add a link for further
-reference, &lt;a 
href="http://foldoc.org/linux"&gt;http://foldoc.org/linux&lt;/a&gt; 
+reference, &lt;a <span 
class="removed"><del><strong>href="http://foldoc.org/linux"&gt;http://foldoc.org/linux&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://foldoc.org/linux"&gt;https://foldoc.org/linux&lt;/a&gt;</em></ins></span>
 
 is a good URL to use.&lt;/p&gt;
 
 <span 
class="removed"><del><strong>&lt;h3&gt;Postscripts&lt;/h3&gt;</strong></del></span>
@@ -235,35 +244,44 @@
 <span 
class="removed"><del><strong>&lt;h3&gt;Notes:&lt;/h3&gt;</strong></del></span>
 <span class="inserted"><ins><em>&lt;div class="column-limit"&gt;&lt;/div&gt;
 
-&lt;h3 class="footnote"&gt;Notes&lt;/h3&gt;</em></ins></span>
+&lt;h3 class="footnote"&gt;Footnotes&lt;/h3&gt;</em></ins></span>
 &lt;ol&gt;
-&lt;li&gt;
-&lt;a id="unexciting"&gt;&lt;/a&gt;These unexciting but essential components
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="unexciting"&gt;&lt;/a&gt;These</strong></del></span>
+<span class="inserted"><ins><em>&lt;li 
id="unexciting"&gt;These</em></ins></span> unexciting but essential components
 include the GNU assembler (GAS) and the linker (GLD), both
 are now part of the &lt;a href="/software/binutils/"&gt;GNU Binutils&lt;/a&gt;
 package, &lt;a href="/software/tar/"&gt;GNU tar&lt;/a&gt;, and many 
more.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="nottools"&gt;&lt;/a&gt;For instance, The Bourne Again SHell (BASH),
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="nottools"&gt;&lt;/a&gt;For</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li id="nottools"&gt;For</em></ins></span> 
instance, The Bourne Again SHell (BASH),
 the PostScript interpreter
 &lt;a href="/software/ghostscript/ghostscript.html"&gt;Ghostscript&lt;/a&gt;, 
and the
 &lt;a href="/software/libc/libc.html"&gt;GNU C library&lt;/a&gt; are not
 programming tools.  Neither are GNUCash, GNOME, and GNU Chess.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="somecomponents"&gt;&lt;/a&gt;For instance, the
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="somecomponents"&gt;&lt;/a&gt;For</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li 
id="somecomponents"&gt;For</em></ins></span> instance, the
 &lt;a href="/software/libc/libc.html"&gt;GNU C library&lt;/a&gt;.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="newersystems"&gt;&lt;/a&gt;Since that was written, a nearly-all-free
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="newersystems"&gt;&lt;/a&gt;Since</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li 
id="newersystems"&gt;Since</em></ins></span> that was written, a nearly-all-free
 Windows-like system has been developed, but technically it is not at
 all like GNU or Unix, so it doesn't really affect this issue.  Most of
 the kernel of Solaris has been made free, but if you wanted to make a
 free system out of that, aside from replacing the missing parts of the
 kernel, you would also need to put it into GNU or BSD.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="gnubsd"&gt;&lt;/a&gt;On the other hand, in the years since this 
article
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="gnubsd"&gt;&lt;/a&gt;On</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li id="gnubsd"&gt;On</em></ins></span> the 
other hand, in the years since this article
 was written, the GNU C Library has been ported to several versions of
 the BSD kernel, which made it straightforward to combine the GNU system
 with that kernel.  Just as with GNU/Linux, these are indeed variants of
@@ -271,10 +289,8 @@
 GNU/kNetBSD depending on the kernel of the system.  Ordinary users on
 typical desktops can hardly distinguish between GNU/Linux and
 GNU/*BSD.&lt;/li&gt;
-
 &lt;/ol&gt;
-<span class="inserted"><ins><em>&lt;/div&gt;
-&lt;/div&gt;</em></ins></span>
+<span class="inserted"><ins><em>&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;
@@ -323,7 +339,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; <span class="removed"><del><strong>1997, 1998, 1999, 
2000, 2001, 2002,</strong></del></span> <span 
class="inserted"><ins><em>1997-2002,</em></ins></span> 2007, <span 
class="removed"><del><strong>2014, 2015, 2016, 2017</strong></del></span> <span 
class="inserted"><ins><em>2014-2017, 2019, 2021</em></ins></span> Richard M. 
Stallman&lt;/p&gt;
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>1997, 1998, 1999, 
2000, 2001, 2002,
+2007, 2014, 2015, 2016, 2017</strong></del></span> <span 
class="inserted"><ins><em>1997-2002, 2005, 2008, 2019, 2021</em></ins></span> 
Richard <span class="removed"><del><strong>M.</strong></del></span> 
Stallman&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
@@ -333,11 +350,12 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/30 18:01:56 $
+$Date: 2021/08/30 13:34:54 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-&lt;/div&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for class="inner", starts 
in the banner include --&gt;</em></ins></span>
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>

Index: gnu/po/linux-and-gnu.ar.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ar.po,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- gnu/po/linux-and-gnu.ar.po  30 May 2021 17:01:39 -0000      1.63
+++ gnu/po/linux-and-gnu.ar.po  30 Aug 2021 13:34:54 -0000      1.64
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2011-02-21 00:31+0200\n"
 "Last-Translator: Hicham <hicham@gmail.com>\n"
 "Language-Team: Arabic\n"
@@ -44,32 +44,41 @@
 "منذ عام 1983 ونحن نطور نظام التشغيل الحر جنو 
على طراز يونيكس، ليمتلك مستخدمو "
 "الحاسوب حريتهم في مشاركة وتطوير البرمجيات 
التي يستخدمونها."
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "لينكس ونظام غنو"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 # | by <a href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a>
 #, fuzzy
 #| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "بقلم <a href=\"http://www.stallman.org/\";>ريتشارد ستولم
ن</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"لمزيد من المعلومات راجع أيضًا <a 
href=\"/gnu/gnu-linux-faq.html\">أسئلة جنو/"
-"لينكس الشائعة</a>، و<a href=\"/gnu/why-gnu-linux.html\">لم
اذا جنو/لينكس؟</a>"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many computer users run a modified version of <a
+# | href=\"/philosophy/categories.html#TheGNUsystem\">the GNU system</a> every
+# | day, without realizing it.  Through a peculiar turn of events, the version
+# | of GNU which is widely used today is often called [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and many of its users are <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> that it is
+# | basically the GNU system, developed by the <a
+# | href=\"/gnu/gnu-history.html\">GNU Project</a>.
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -83,6 +92,14 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"لمزيد من المعلومات راجع أيضًا <a 
href=\"/gnu/gnu-linux-faq.html\">أسئلة جنو/"
+"لينكس الشائعة</a>، و<a href=\"/gnu/why-gnu-linux.html\">لم
اذا جنو/لينكس؟</a>"
+
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -101,10 +118,22 @@
 "لينكس إليه، أو جنو/لينكس. كل التوزيعات الم
سماة &rdquo;لينكس&ldquo; هي في "
 "الحقيقة توزيعات جنو/لينكس."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many users do not understand the difference between the kernel, which is
+# | Linux, and the whole system, which they also call [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} The ambiguous use of the name doesn't help people
+# | understand.  These users often think that Linus Torvalds developed the
+# | whole operating system in 1991, with a bit of help.
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -114,7 +143,7 @@
 "الناس على الفهم. هؤلاء المستخدمين يعتقدون 
عادة أن لينوس تورفالدس طوّر كامل "
 "النظام في عام 1991 بمساعدة ضئيلة."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -131,7 +160,7 @@
 "(بدون سبب معين) أن معظم الأشياء الضرورية 
لإنشاء نظام شبيه بيونكس كانت متوفرة "
 "بالفعل."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free software</"
@@ -150,7 +179,7 @@
 "الابتدائي</a> لمشروع جنو يؤطر بعض الخطط 
الأصلية لنظام جنو. في الوقت الذي بدأ "
 "فيه لينكس، كان جنو شبه مكتمل."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -164,18 +193,42 @@
 "كتابة منسق نصوص (تخ)؛ وبدأ بوب سكيفلر تطوير 
نظام نوفذة (نظام النوفذة إكس). "
 "من الطبيعي قياس مساهمة هذا النوع من الم
شاريع بالبرامج التي تأتي منه."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If we tried to measure the GNU Project's contribution in this way, what
+# | would we conclude? One CD-ROM vendor found that in their &ldquo;Linux
+# | [-distribution&rdquo;,-] {+distribution,&rdquo;+} <a
+# | href=\"/philosophy/categories.html#GNUsoftware\">GNU software</a> was the
+# | largest single contingent, around 28% of the total source code, and this
+# | included some of the essential major components without which there could
+# | be no system.  Linux itself was about 3%.  (The proportions in 2008 are
+# | similar: in the &ldquo;main&rdquo; repository of gNewSense, Linux is 1.5%
+# | and GNU packages are 15%.)  So if you were going to pick a name for the
+# | system based on who wrote the programs in the system, the most appropriate
+# | single choice would be [-&ldquo;GNU&rdquo;.-] {+&ldquo;GNU.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "If we tried to measure the GNU Project's contribution in this way, what "
+#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
+#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
+#| "\">GNU software</a> was the largest single contingent, around 28% of the "
+#| "total source code, and this included some of the essential major "
+#| "components without which there could be no system.  Linux itself was "
+#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
+#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
+#| "15%.)  So if you were going to pick a name for the system based on who "
+#| "wrote the programs in the system, the most appropriate single choice "
+#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "لكن إذا حاولنا قياس مساهمة مشروع جنو بهذه 
الطريقة فماذا سنحسب؟ وجد أحد بائعي "
 "الاسطوانات في &rdquo;توزيعته للينكس&ldquo; أن <a 
href=\"/philosophy/"
@@ -186,7 +239,7 @@
 "بصدد إطلاق اسم للنظام مبني على الذين كتبوا 
البرامج فيه، فإن أكثر اسم ملائمة "
 "هو &rdquo;جنو&ldquo;."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -201,7 +254,7 @@
 "على الرغم من أننا طورنا محرّرًا. بدأ مشروع 
جنو في تطوير <em>نظام شبيه بيونكس "
 "حر كامل</em>هو نظام التشغيل جنو."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -226,7 +279,7 @@
 "الكثير من الأجزاء التي ليست أدوات <a 
href=\"#nottools\">(2)</a>. طورنا حتى "
 "لعبة شطرنج -شطرنج جنو- لأن النظام الكامل 
يحتاج إلى ألعابٍ أيضًا."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -241,11 +294,27 @@
 "linux.html\">بدأت جنو هُرد العمل بثقة في عام 
2001</a>، لكن مازال أمامها "
 "الكثير حتى تكون جاهزةً لاستخدام الناس 
العام."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once
+# | Torvalds freed Linux in 1992, it fit into the last major gap in the GNU
+# | system.  People could then <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | combine Linux with the GNU system</a> to make a complete free system
+# | &mdash; a version of the GNU system which also contained Linux.  The
+# | GNU/Linux system, in other words.
+#, fuzzy
+#| msgid ""
+#| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
+#| "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
+#| "system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+#| "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the "
+#| "GNU system</a> to make a complete free system &mdash; a version of the "
+#| "GNU system which also contained Linux.  The GNU/Linux system, in other "
+#| "words."
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -256,7 +325,7 @@
 "مع نظام جنو</a> لإنشاء نظام حر كامل: إصدار من 
نظام جنو مبني على لينكس؛ أو "
 "للاختصار نظام جنو/لينكس."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -276,11 +345,25 @@
 "المختلفة أدوا الكثير من العمل الجوهري، 
لكن شخصًا ما كان سيؤدي هذا العمل حتمًا "
 "على جميع الأحوال."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU
+# | system.  The <a href=\"http{+s+}://fsf.org/\">FSF</a> funded the rewriting
+# | of the Linux-related extensions to the GNU C library, so that now they are
+# | well integrated, and the newest GNU/Linux systems use the current library
+# | release with no changes.  The FSF also funded an early stage of the
+# | development of Debian GNU/Linux.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -291,7 +374,7 @@
 "تستخدم إصدار المكتبة الحالي بدون تغييرات. 
موّلت إف&#8204;إس&#8204;إف أيضًا "
 "منصة مبكرة لتطوير دبيان جنو/لينكس."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Today there are many different variants of the GNU/Linux system (often
 # | called &ldquo;distros&rdquo;).  Most of them include [-non-free
 # | software&mdash;their-] {+nonfree programs&mdash;their+} developers follow
@@ -329,15 +412,15 @@
 "توزيعات جنو/لينكس حرة بالكامل</a>. تدعم 
إف&#8204;إس&#8204;إف <a href="
 "\"http://gnewsense.org/\";>جي‌نيوسنس</a> ماديًا."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Making a free GNU/Linux distribution is not just a matter of eliminating
 # | various non[---]free programs.  Nowadays, the usual version of Linux
 # | contains non[---]free programs too.  These programs are intended to be
 # | loaded into I/O devices when the system starts, and they are included, as
 # | long series of numbers, in the \"source code\" of Linux.  Thus,
 # | maintaining free GNU/Linux distributions now entails maintaining a <a
-# | href=\"http://directory.fsf.org/project/linux\";> free version of Linux</a>
-# | too.
+# | href=\"http{+s+}://directory.fsf.org/project/linux\"> free version of
+# | Linux</a> too.
 #, fuzzy
 #| msgid ""
 #| "Making a free GNU/Linux distribution is not just a matter of eliminating "
@@ -353,7 +436,7 @@
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 "إيجاد توزيعة جنو/لينكس حرة لا يعني فقط 
إقصاء برامج غير حرة عديدة. اليوم "
@@ -363,26 +446,55 @@
 "لينكس حرة يستلزم الآن إبقاء <a 
href=\"http://directory.fsf.org/project/linux";
 "\"> إصدار لينكس حر</a> أيضا."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Whether you use GNU/Linux or not, please don't confuse the public by using
+# | the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the
+# | essential major components of the system.  The system as a whole is
+# | basically the GNU system, with Linux added.  When you're talking about
+# | this combination, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "سواءً كنت تستخدم جنو/لينكس أو لم تكن، من 
فضلك لا تشتت العامة باستخدام الاسم "
 "&rdquo;لينكس&ldquo; بشكل مبهم. لينكس هو النواة، 
واحدة من مكونات النظام "
 "الأساسية الجوهرية. النظام ككل أساسا هو 
نظام جنو، مع إضافة لينكس. عندما تتحدث "
 "عن هذا الجمع بينهما، من فضلك سمّه 
&rdquo;جنو/لينكس&ldquo;."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
+# | reference, this page and <a href=\"/gnu/the-gnu-project.html\">
+# | http{+s+}://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
+# | you mention Linux, the kernel, and want to add a link for further
+# | reference, <a
+# | [-href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a>-]
+# | {+href=\"https://foldoc.org/linux\";>https://foldoc.org/linux</a>+} is a
+# | good URL to use.
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "إذا أردت إنشاء وصلة عن &rdquo;جنو/لينكس&ldquo; كم
رجع الخارجي، فإن هذه الصفحة "
 "و<a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/the-gnu-";
@@ -390,11 +502,11 @@
 "للمرجع الخارجي، فإن <a 
href=\"http://foldoc.org/linux\";>http://foldoc.org/";
 "linux</a> مسار جيد للاستخدام."
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr "ملحقات"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Aside from GNU, one other project has independently produced a free
 # | Unix-like operating system.  This system is known as BSD, and it was
 # | developed at UC Berkeley.  It was non[---]free in the 80s, but became free
@@ -423,7 +535,7 @@
 "اليوم <a href=\"#newersystems\">(4)</a> يعتبر غالبا 
تنويعة من نظام جنو، أو "
 "نوعًا من نظام بي&#8204;إس&#8204;دي."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -444,53 +556,93 @@
 "نواة ويضيفوها إلى نظام جنو، لذا فاسم 
جنو/بي&#8204;إس&#8204;دي لن يلائم الوضع."
 "<a href=\"#gnubsd\">(5)</a>"
 
-#. type: Content of: <div><div><h3>
-# | Notes[-:-]
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Footnotes"
+msgid "Footnotes"
+msgstr "هوامش"
+
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"unexciting\"></a>These-]{+These+} unexciting but essential
+# | components include the GNU assembler (GAS) and the linker (GLD), both are
+# | now part of the <a href=\"/software/binutils/\">GNU Binutils</a> package,
+# | <a href=\"/software/tar/\">GNU tar</a>, and many more.
 #, fuzzy
-#| msgid "Notes:"
-msgid "Notes"
-msgstr "ملاحظات"
-
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+#| msgid ""
+#| "<a id=\"unexciting\"></a>These unexciting but essential components "
+#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
+#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
+#| "\"/software/tar/\">GNU tar</a>, and many more."
+msgid ""
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\"></a>يدخل في المكونات الجوهرية 
المملّة مُجمّع جنو وGAS "
 "والرابط GLD وكلها الآن جزء من حزمة <a 
href=\"/software/binutils/\">GNU "
 "Binutils</a>، و<a href=\"/software/tar/\">GNU tar</a> بالإضافة 
إلى غيرها."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"nottools\"></a>For-]{+For+} instance, The Bourne Again SHell
+# | (BASH), the PostScript interpreter <a
+# | href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the
+# | <a href=\"/software/libc/libc.html\">GNU C library</a> are not programming
+# | tools.  Neither are GNUCash, GNOME, and GNU Chess.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\"></a>على سبيل المثال، The Bourne Again SHell 
(BASH) ومفسر "
 "PostScript <a href=\"/software/ghostscript/ghostscript.html\">Ghostscript</"
 "a> و<a href=\"/software/libc/libc.html\">مكتبة جنو سي</a> ليست 
أدوات برمجة. "
 "وكذلك GNUCash وجنوم وشطرنج جنو."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"somecomponents\"></a>For-]{+For+} instance, the <a
+# | href=\"/software/libc/libc.html\">GNU C library</a>.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\"></a>مثل <a href=\"/software/libc/libc.html\">م
كتبة "
 "جنو سي</a>."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"newersystems\"></a>Since-]{+Since+} that was written, a
+# | nearly-all-free Windows-like system has been developed, but technically it
+# | is not at all like GNU or Unix, so it doesn't really affect this issue. 
+# | Most of the kernel of Solaris has been made free, but if you wanted to
+# | make a free system out of that, aside from replacing the missing parts of
+# | the kernel, you would also need to put it into GNU or BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\"></a> منذ ذلك الحين، طُوّر نظام 
شبيه بويندوز شبه حر "
 "بالكامل، لكنه عمليًا ليس شبيهًا بجنو أو 
يونكس، لذا فهو لا يُؤثر في القضية. جُعلت "
@@ -498,15 +650,31 @@
 "واستبدال الأجزاء الناقصة من النواة، فسوف 
تحتاج إلى إضافتها إلى جنو أو "
 "بي&#8204;إس&#8204;دي."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"gnubsd\"></a>On-]{+On+} the other hand, in the years since this
+# | article was written, the GNU C Library has been ported to several versions
+# | of the BSD kernel, which made it straightforward to combine the GNU system
+# | with that kernel.  Just as with GNU/Linux, these are indeed variants of
+# | GNU, and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD
+# | depending on the kernel of the system.  Ordinary users on typical desktops
+# | can hardly distinguish between GNU/Linux and GNU/*BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
+#| "was written, the GNU C Library has been ported to several versions of the "
+#| "BSD kernel, which made it straightforward to combine the GNU system with "
+#| "that kernel.  Just as with GNU/Linux, these are indeed variants of GNU, "
+#| "and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD "
+#| "depending on the kernel of the system.  Ordinary users on typical "
+#| "desktops can hardly distinguish between GNU/Linux and GNU/*BSD."
+msgid ""
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a id=\"gnubsd\"></a>في المقابل، في السنوات الأخيرة 
منذ كتب هذا المقال، "
 "أضيفت مكتبة جنو سي إلى نواة BSD، والتي جعلت م
ن الممكن ضم نظام جنو مع هذه "
@@ -565,15 +733,13 @@
 "href=\"/server/standards/README.translations.html\">دليل الترجم
Ø©</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; [-1997, 1998, 1999, 2000, 2001, 2002,-] {+1997-2002,+}
-# | 2007, [-2014, 2015, 2016, 2017-] {+2014-2017, 2019, 2021+} Richard M.
-# | Stallman
+# | Copyright &copy; [-1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014, 2015,
+# | 2016, 2017-] {+1997-2002, 2005, 2008, 2019, 2021+} Richard [-M.-] Stallman
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014, 2015, "
 #| "2016, 2017 Richard M. Stallman"
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "حقوق النشر:</p><p style=\"direction: ltr\">\n"
 "Copyright &copy; 1997-2002, 2007, 2014, 2015, 2016, 2017 Richard M. Stallman "
@@ -602,6 +768,11 @@
 msgid "Updated:"
 msgstr "حُدّثت:"
 
+#, fuzzy
+#~| msgid "Notes:"
+#~ msgid "Notes"
+#~ msgstr "ملاحظات"
+
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"

Index: gnu/po/linux-and-gnu.bg.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.bg.po,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- gnu/po/linux-and-gnu.bg.po  30 May 2021 18:30:21 -0000      1.47
+++ gnu/po/linux-and-gnu.bg.po  30 Aug 2021 13:34:54 -0000      1.48
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2009-10-28 11:43+0200\n"
 "Last-Translator: Yavor Doganov <yavor@gnu.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -42,28 +42,37 @@
 "„Юникс“), така че компютърните 
потребители да имат свободата да споделят 
и "
 "подобряват софтуера, който използват."
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "Линукс и система GNU"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "от <a href=\"https://www.stallman.org/\";>Ричард 
Столман</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"За повече информация вижте също <a 
href=\"/gnu/gnu-linux-faq.html\">ЧЗВ за "
-"GNU/Линукс</a> и <a href=\"/gnu/why-gnu-linux.html\">Защо 
GNU/Линукс?</a>"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many computer users run a modified version of <a
+# | href=\"/philosophy/categories.html#TheGNUsystem\">the GNU system</a> every
+# | day, without realizing it.  Through a peculiar turn of events, the version
+# | of GNU which is widely used today is often called [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and many of its users are <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> that it is
+# | basically the GNU system, developed by the <a
+# | href=\"/gnu/gnu-history.html\">GNU Project</a>.
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -78,6 +87,14 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"За повече информация вижте също <a 
href=\"/gnu/gnu-linux-faq.html\">ЧЗВ за "
+"GNU/Линукс</a> и <a href=\"/gnu/why-gnu-linux.html\">Защо 
GNU/Линукс?</a>"
+
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -98,10 +115,22 @@
 "Всички така наречени „Линукс“ 
дистрибуции на практика са дистрибуции на 
GNU/"
 "Линукс."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many users do not understand the difference between the kernel, which is
+# | Linux, and the whole system, which they also call [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} The ambiguous use of the name doesn't help people
+# | understand.  These users often think that Linus Torvalds developed the
+# | whole operating system in 1991, with a bit of help.
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -112,7 +141,7 @@
 "недоразумение.  Тези потребители често 
мислят, че Линус Торвалдс е "
 "разработил цялата система през 1991 г. с 
малко помощ."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -131,7 +160,7 @@
 "почти всичко необходимо за изготвянето на 
система, подобна на „Юникс“, вече "
 "било налично."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free software</"
@@ -152,7 +181,7 @@
 "очертава някои от оригиналните планове за 
системата GNU.  По времето, когато "
 "Линукс бе написан, GNU беше почти завършена."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -169,18 +198,42 @@
 "определяме приноса на този вид проект 
чрез специфичните програми, които са "
 "произлезли от него."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If we tried to measure the GNU Project's contribution in this way, what
+# | would we conclude? One CD-ROM vendor found that in their &ldquo;Linux
+# | [-distribution&rdquo;,-] {+distribution,&rdquo;+} <a
+# | href=\"/philosophy/categories.html#GNUsoftware\">GNU software</a> was the
+# | largest single contingent, around 28% of the total source code, and this
+# | included some of the essential major components without which there could
+# | be no system.  Linux itself was about 3%.  (The proportions in 2008 are
+# | similar: in the &ldquo;main&rdquo; repository of gNewSense, Linux is 1.5%
+# | and GNU packages are 15%.)  So if you were going to pick a name for the
+# | system based on who wrote the programs in the system, the most appropriate
+# | single choice would be [-&ldquo;GNU&rdquo;.-] {+&ldquo;GNU.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "If we tried to measure the GNU Project's contribution in this way, what "
+#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
+#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
+#| "\">GNU software</a> was the largest single contingent, around 28% of the "
+#| "total source code, and this included some of the essential major "
+#| "components without which there could be no system.  Linux itself was "
+#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
+#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
+#| "15%.)  So if you were going to pick a name for the system based on who "
+#| "wrote the programs in the system, the most appropriate single choice "
+#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "Ако се опитаме да определим приноса на 
проекта GNU по този начин, какво "
 "бихме заключили?  Един производител на CD-ROM 
открил, че в тяхната „Линукс "
@@ -192,7 +245,7 @@
 "пакетите на GNU са 15%.)  Така че ако трябва да 
изберете име на системата по "
 "това кой е написал програмите, 
най-правилният и единствен избор би бил 
„GNU“."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -209,7 +262,7 @@
 "Проектът GNU се е заел с разработката на 
<em>цялостна операционна система, "
 "подобна на „Юникс“</em> — GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -237,7 +290,7 @@
 "href=\"#nottools\">(2)</a>.  Дори разработихме и игра 
на шах, GNU Chess, "
 "понеже една цялостна система има нужда и 
от добри игри."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -253,11 +306,11 @@
 "hurd/hurd-and-linux.html\">GNU Hurd започна да работи 
стабилно през 2001 г.</"
 "a>, но доста път трябва да бъде изминат, 
докато хората могат да го ползват."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once
 # | Torvalds [-wrote Linux,-] {+freed Linux in 1992,+} it fit into the last
 # | major gap in the GNU system.  People could then <a
-# | 
href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
 # | combine Linux with the GNU system</a> to make a complete free [-system:-]
 # | {+system &mdash;+} a [-Linux-based-] version of the GNU [-system; the-]
 # | {+system which also contained Linux.  The+} GNU/Linux system, [-for
@@ -273,7 +326,7 @@
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -286,7 +339,7 @@
 "цялостна свободна система, т.е. версия на 
системата GNU, базирана на Линукс, "
 "или съкратено — GNU/Линукс."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -309,11 +362,25 @@
 "работа, която поради естеството на нещата 
със сигурност щеше да бъде "
 "свършена от някой."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU
+# | system.  The <a href=\"http{+s+}://fsf.org/\">FSF</a> funded the rewriting
+# | of the Linux-related extensions to the GNU C library, so that now they are
+# | well integrated, and the newest GNU/Linux systems use the current library
+# | release with no changes.  The FSF also funded an early stage of the
+# | development of Debian GNU/Linux.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -325,7 +392,7 @@
 "използват текущото издание на 
библиотеката без промени.  ФСС спонсорира 
също "
 "и ранния стадий на разработка на Дебиан 
GNU/Линукс."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Today there are many different variants of the GNU/Linux system (often
 # | called &ldquo;distros&rdquo;).  Most of them include [-non-free
 # | software&mdash;their-] {+nonfree programs&mdash;their+} developers follow
@@ -364,14 +431,31 @@
 "ФСС поддържа компютърни съоръжения за <a 
href=\"http://gnewsense.org";
 "\">gNewSense</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Making a free GNU/Linux distribution is not just a matter of eliminating
+# | various nonfree programs.  Nowadays, the usual version of Linux contains
+# | nonfree programs too.  These programs are intended to be loaded into I/O
+# | devices when the system starts, and they are included, as long series of
+# | numbers, in the \"source code\" of Linux.  Thus, maintaining free
+# | GNU/Linux distributions now entails maintaining a <a
+# | href=\"http{+s+}://directory.fsf.org/project/linux\"> free version of
+# | Linux</a> too.
+#, fuzzy
+#| msgid ""
+#| "Making a free GNU/Linux distribution is not just a matter of eliminating "
+#| "various nonfree programs.  Nowadays, the usual version of Linux contains "
+#| "nonfree programs too.  These programs are intended to be loaded into I/O "
+#| "devices when the system starts, and they are included, as long series of "
+#| "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/"
+#| "Linux distributions now entails maintaining a <a href=\"http://directory.";
+#| "fsf.org/project/linux\"> free version of Linux</a> too."
 msgid ""
 "Making a free GNU/Linux distribution is not just a matter of eliminating "
 "various nonfree programs.  Nowadays, the usual version of Linux contains "
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 "Издаването на свободна дистрибуция на 
GNU/Линукс не е просто въпрос на "
@@ -383,13 +467,26 @@
 "налага и поддържането на <a 
href=\"http://directory.fsf.org/project/linux";
 "\">свободна версия на Линукс</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Whether you use GNU/Linux or not, please don't confuse the public by using
+# | the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the
+# | essential major components of the system.  The system as a whole is
+# | basically the GNU system, with Linux added.  When you're talking about
+# | this combination, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Независимо дали използвате GNU/Линукс или 
не, молим ви да не обърквате "
 "хората, като използвате името „Линукс“ 
двусмислено.  Линукс е ядрото, един "
@@ -397,13 +494,29 @@
 "малко или много системата GNU, с добавен 
Линукс.  Когато говорите за тази "
 "комбинация, моля наричайте я „GNU/Линукс“."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
+# | reference, this page and <a href=\"/gnu/the-gnu-project.html\">
+# | http{+s+}://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
+# | you mention Linux, the kernel, and want to add a link for further
+# | reference, <a
+# | [-href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a>-]
+# | {+href=\"https://foldoc.org/linux\";>https://foldoc.org/linux</a>+} is a
+# | good URL to use.
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "Ако искате да направите хипервръзка за 
повече информация за „GNU/Линукс“, "
 "тази страница и <a 
href=\"/gnu/the-gnu-project.html\">http://www.gnu.org/gnu/";
@@ -412,11 +525,11 @@
 "можете да използвате, е <a 
href=\"http://foldoc.org/linux\";>http://foldoc.";
 "org/linux</a>."
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr "Послепис"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Aside from GNU, one other project has independently produced a free Unix-"
 "like operating system.  This system is known as BSD, and it was developed at "
@@ -432,7 +545,7 @@
 "система, съществуваща днес<a 
href=\"#newersystems\">(4)</a>, е почти със "
 "сигурност или вариант на системата GNU, или 
разновидност на системата BSD."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -454,29 +567,53 @@
 "просто са написали ядро, което после са 
добавили към системата GNU, така че "
 "име като GNU/BSD би било неподходящо.<a 
href=\"#gnubsd\">(5)</a>"
 
-#. type: Content of: <div><div><h3>
-msgid "Notes"
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Footnotes"
+msgid "Footnotes"
 msgstr "Бележки"
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"unexciting\"></a>These-]{+These+} unexciting but essential
+# | components include the GNU assembler (GAS) and the linker (GLD), both are
+# | now part of the <a href=\"/software/binutils/\">GNU Binutils</a> package,
+# | <a href=\"/software/tar/\">GNU tar</a>, and many more.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"unexciting\"></a>These unexciting but essential components "
+#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
+#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
+#| "\"/software/tar/\">GNU tar</a>, and many more."
+msgid ""
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\"></a>Тези не чак толкова 
вълнуващи, но съществени "
 "компоненти включват асемблера на GNU (GAS) и 
свързващата програма (GLD), "
 "които вече са част от пакета <a 
href=\"/software/binutils/\">GNU Binutils</"
 "a>, <a href=\"/software/tar/\">GNU tar</a>, и още."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"nottools\"></a>For-]{+For+} instance, The Bourne Again SHell
+# | (BASH), the PostScript interpreter <a
+# | href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the
+# | <a href=\"/software/libc/libc.html\">GNU C library</a> are not programming
+# | tools.  Neither are GNUCash, GNOME, and GNU Chess.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\"></a>Например, интерпретатора на 
обвивката Bourne Again "
 "SHell (BASH), интерпретатора на PostScript <a 
href=\"/software/ghostscript/"
@@ -484,22 +621,41 @@
 "\">библиотеката на GNU за Си</a> не са 
програмни инструменти.  Нито пък "
 "GNUCash, GNOME и GNU Chess."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"somecomponents\"></a>For-]{+For+} instance, the <a
+# | href=\"/software/libc/libc.html\">GNU C library</a>.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\"></a>Например, <a 
href=\"/software/libc/libc.html"
 "\">библиотеката на GNU за Си</a>."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"newersystems\"></a>Since-]{+Since+} that was written, a
+# | nearly-all-free Windows-like system has been developed, but technically it
+# | is not at all like GNU or Unix, so it doesn't really affect this issue. 
+# | Most of the kernel of Solaris has been made free, but if you wanted to
+# | make a free system out of that, aside from replacing the missing parts of
+# | the kernel, you would also need to put it into GNU or BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\"></a>Откакто това бе написано, 
бе разработена почти "
 "напълно свободна система, подобна на 
„Уиндоус“.  Но от техническа гледна "
@@ -508,15 +664,15 @@
 "свободен софтуер, но за да получите 
свободна система с него, е необходимо да "
 "го комбинирате с GNU или BSD, както и да 
замените липсващите части на ядрото."
 
-#. type: Content of: <div><div><ol><li>
-# | <a id=\"gnubsd\"></a>On the other hand, in the years since this article
-# | was written, the GNU C Library has been ported to {+several versions of+}
-# | the BSD kernel, which made it [-possible-] {+straightforward+} to combine
-# | the GNU system with that kernel.  Just as with GNU/Linux, these are indeed
-# | variants of GNU, and are therefore [-called-] {+called, for instance,+}
-# | GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the system. 
-# | Ordinary users on typical desktops can hardly distinguish between
-# | GNU/Linux and GNU/*BSD.
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"gnubsd\"></a>On-]{+On+} the other hand, in the years since this
+# | article was written, the GNU C Library has been ported to {+several
+# | versions of+} the BSD kernel, which made it [-possible-]
+# | {+straightforward+} to combine the GNU system with that kernel.  Just as
+# | with GNU/Linux, these are indeed variants of GNU, and are therefore
+# | [-called-] {+called, for instance,+} GNU/kFreeBSD and GNU/kNetBSD
+# | depending on the kernel of the system.  Ordinary users on typical desktops
+# | can hardly distinguish between GNU/Linux and GNU/*BSD.
 #, fuzzy
 #| msgid ""
 #| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
@@ -527,13 +683,13 @@
 #| "system.  Ordinary users on typical desktops can hardly distinguish "
 #| "between GNU/Linux and GNU/*BSD."
 msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a id=\"gnubsd\"></a>От друга страна, в годините 
след написването на тази "
 "статия, библиотеката на GNU за Си беше 
адаптирана към ядрото BSD, което "
@@ -586,12 +742,11 @@
 "подаването на преводи на тази статия."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 1997-2002, [-2007-] {+2007, 2014-2017, 2019, 2021+}
-# | Richard M. Stallman
+# | Copyright &copy; 1997-2002, [-2007-] {+2005, 2008, 2019, 2021+} Richard
+# | [-M.-] Stallman
 #, fuzzy
 #| msgid "Copyright &copy; 1997-2002, 2007 Richard M. Stallman"
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr "Copyright &copy; 1997-2002, 2007 Richard M. Stallman (Ричард 
Столман)"
 
 #. type: Content of: <div><p>
@@ -615,3 +770,6 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Последно обновяване:"
+
+#~ msgid "Notes"
+#~ msgstr "Бележки"

Index: gnu/po/linux-and-gnu.ca-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ca-diff.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gnu/po/linux-and-gnu.ca-diff.html   30 May 2021 19:03:10 -0000      1.14
+++ gnu/po/linux-and-gnu.ca-diff.html   30 Aug 2021 13:34:54 -0000      1.15
@@ -10,44 +10,49 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.79</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.79</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;Linux and GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU 
HURD, Hurd" /&gt;
 &lt;meta http-equiv="Description" content="Since 1983, developing the free 
Unix style operating system GNU, so that computer users can have the freedom to 
share and improve the software they use." /&gt;
 &lt;!--#include virtual="/gnu/po/linux-and-gnu.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;Linux</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;Linux</em></ins></span> 
and the GNU System&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;Linux and the GNU System&lt;/h2&gt;
 
-<span 
class="removed"><del><strong>&lt;p&gt;&lt;strong&gt;by</strong></del></span>
+<span class="removed"><del><strong>&lt;p&gt;&lt;strong&gt;by &lt;a 
href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;address class="byline 
c"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
-<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;
-
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;For</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;For</em></ins></span> more 
information see also
+  &lt;blockquote&gt;&lt;p&gt;For more information see also
 the &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;,
-and &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;&lt;/p&gt;
-  <span class="removed"><del><strong>&lt;/blockquote&gt;</strong></del></span>
-&lt;/div&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;
+and</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;address 
class="byline"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="/gnu/why-gnu-linux.html"&gt;Why 
GNU/Linux?&lt;/a&gt;&lt;/p&gt;
+  &lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;
 Many computer users run a modified version of
 &lt;a href="/philosophy/categories.html#TheGNUsystem"&gt;the GNU 
system&lt;/a&gt;
 every day, without realizing it.  Through a peculiar turn of events,
 the version of GNU which is widely used today is often called
-&ldquo;Linux&rdquo;, and many of its users
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> and 
many of its users
 are &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt; not aware&lt;/a&gt;
 that it is basically the GNU system, developed by the
 &lt;a href="/gnu/gnu-history.html"&gt;GNU Project&lt;/a&gt;.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;div class="announcement comment" 
role="complementary"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;p&gt;For more information see also
+the &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;,
+and &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;</em></ins></span>
+
 &lt;p&gt;
 There really is a Linux, and these people are using it, but it is just
 a part of the system they use.  Linux is the kernel: the program in
@@ -63,7 +68,8 @@
 &lt;p&gt;
 Many users do not understand the difference between the kernel, which
 is Linux, and the whole system, which they also call
-&ldquo;Linux&rdquo;.  The ambiguous use of the name doesn't help
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  The 
ambiguous use of the name doesn't help
 people understand.  These users often think that Linus Torvalds
 developed the whole operating system in 1991, with a bit of help.&lt;/p&gt;
 
@@ -100,7 +106,8 @@
 &lt;p&gt;
 If we tried to measure the GNU Project's contribution in this way,
 what would we conclude?  One CD-ROM vendor found that in their &ldquo;Linux
-distribution&rdquo;, &lt;a 
href="/philosophy/categories.html#GNUsoftware"&gt;GNU
+<span class="removed"><del><strong>distribution&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>distribution,&rdquo;</em></ins></span> &lt;a 
href="/philosophy/categories.html#GNUsoftware"&gt;GNU
 software&lt;/a&gt; was the largest single contingent, around 28% of the
 total source code, and this included some of the essential major
 components without which there could be no system.  Linux itself was
@@ -108,7 +115,7 @@
 repository of gNewSense, Linux is 1.5% and GNU packages are 15%.)
 So if you were going to pick a name for the system based on
 who wrote the programs in the system, the most appropriate single
-choice would be &ldquo;GNU&rdquo;.&lt;/p&gt;
+choice would be <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU.&rdquo;&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
 But that is not the deepest way to consider the question.  The GNU
@@ -147,7 +154,7 @@
 Fortunately, we didn't have to wait for the Hurd, because of Linux.
 Once Torvalds freed Linux in 1992, it fit into the last major gap in
 the GNU system.  People could
-then &lt;a 
href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+then &lt;a <span 
class="removed"><del><strong>href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
 combine Linux with the GNU system&lt;/a&gt; to make a complete free system
 &mdash; a version of the GNU system which also contained Linux.  The
 GNU/Linux system, in other words.&lt;/p&gt;
@@ -165,7 +172,7 @@
 
 &lt;p&gt;
 The GNU Project supports GNU/Linux systems as well as &lt;em&gt;the&lt;/em&gt; 
GNU
-system.  The &lt;a href="http://fsf.org/"&gt;FSF&lt;/a&gt; funded the 
rewriting of
+system.  The &lt;a <span 
class="removed"><del><strong>href="http://fsf.org/"&gt;FSF&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://fsf.org/"&gt;FSF&lt;/a&gt;</em></ins></span>
 funded the rewriting of
 the Linux-related extensions to the GNU C library, so that now they
 are well integrated, and the newest GNU/Linux systems use the current
 library release with no changes.  The FSF also funded an early stage
@@ -189,7 +196,7 @@
 be loaded into I/O devices when the system starts, and they are
 included, as long series of numbers, in the "source code" of Linux.
 Thus, maintaining free GNU/Linux distributions now entails maintaining
-a &lt;a href="http://directory.fsf.org/project/linux"&gt; free version of
+a &lt;a <span 
class="removed"><del><strong>href="http://directory.fsf.org/project/linux"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://directory.fsf.org/project/linux"&gt;</em></ins></span>
 free version of
 Linux&lt;/a&gt; too.&lt;/p&gt;
 
 &lt;p&gt;Whether you use GNU/Linux or not, please don't confuse the public
@@ -197,14 +204,16 @@
 kernel, one of the essential major components of the system.  The
 system as a whole is basically the GNU system, with Linux added.  When
 you're talking about this combination, please call it
-&ldquo;GNU/Linux&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.&lt;/p&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
 If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
 reference, this page and &lt;a href="/gnu/the-gnu-project.html"&gt;
-http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt; are good choices.  If
+<span 
class="removed"><del><strong>http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>https://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</em></ins></span>
 are good choices.  If
 you mention Linux, the kernel, and want to add a link for further
-reference, &lt;a 
href="http://foldoc.org/linux"&gt;http://foldoc.org/linux&lt;/a&gt; 
+reference, &lt;a <span 
class="removed"><del><strong>href="http://foldoc.org/linux"&gt;http://foldoc.org/linux&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://foldoc.org/linux"&gt;https://foldoc.org/linux&lt;/a&gt;</em></ins></span>
 
 is a good URL to use.&lt;/p&gt;
 
 <span 
class="removed"><del><strong>&lt;h3&gt;Postscripts&lt;/h3&gt;</strong></del></span>
@@ -235,35 +244,44 @@
 <span 
class="removed"><del><strong>&lt;h3&gt;Notes:&lt;/h3&gt;</strong></del></span>
 <span class="inserted"><ins><em>&lt;div class="column-limit"&gt;&lt;/div&gt;
 
-&lt;h3 class="footnote"&gt;Notes&lt;/h3&gt;</em></ins></span>
+&lt;h3 class="footnote"&gt;Footnotes&lt;/h3&gt;</em></ins></span>
 &lt;ol&gt;
-&lt;li&gt;
-&lt;a id="unexciting"&gt;&lt;/a&gt;These unexciting but essential components
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="unexciting"&gt;&lt;/a&gt;These</strong></del></span>
+<span class="inserted"><ins><em>&lt;li 
id="unexciting"&gt;These</em></ins></span> unexciting but essential components
 include the GNU assembler (GAS) and the linker (GLD), both
 are now part of the &lt;a href="/software/binutils/"&gt;GNU Binutils&lt;/a&gt;
 package, &lt;a href="/software/tar/"&gt;GNU tar&lt;/a&gt;, and many 
more.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="nottools"&gt;&lt;/a&gt;For instance, The Bourne Again SHell (BASH),
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="nottools"&gt;&lt;/a&gt;For</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li id="nottools"&gt;For</em></ins></span> 
instance, The Bourne Again SHell (BASH),
 the PostScript interpreter
 &lt;a href="/software/ghostscript/ghostscript.html"&gt;Ghostscript&lt;/a&gt;, 
and the
 &lt;a href="/software/libc/libc.html"&gt;GNU C library&lt;/a&gt; are not
 programming tools.  Neither are GNUCash, GNOME, and GNU Chess.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="somecomponents"&gt;&lt;/a&gt;For instance, the
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="somecomponents"&gt;&lt;/a&gt;For</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li 
id="somecomponents"&gt;For</em></ins></span> instance, the
 &lt;a href="/software/libc/libc.html"&gt;GNU C library&lt;/a&gt;.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="newersystems"&gt;&lt;/a&gt;Since that was written, a nearly-all-free
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="newersystems"&gt;&lt;/a&gt;Since</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li 
id="newersystems"&gt;Since</em></ins></span> that was written, a nearly-all-free
 Windows-like system has been developed, but technically it is not at
 all like GNU or Unix, so it doesn't really affect this issue.  Most of
 the kernel of Solaris has been made free, but if you wanted to make a
 free system out of that, aside from replacing the missing parts of the
 kernel, you would also need to put it into GNU or BSD.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="gnubsd"&gt;&lt;/a&gt;On the other hand, in the years since this 
article
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="gnubsd"&gt;&lt;/a&gt;On</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li id="gnubsd"&gt;On</em></ins></span> the 
other hand, in the years since this article
 was written, the GNU C Library has been ported to several versions of
 the BSD kernel, which made it straightforward to combine the GNU system
 with that kernel.  Just as with GNU/Linux, these are indeed variants of
@@ -271,10 +289,8 @@
 GNU/kNetBSD depending on the kernel of the system.  Ordinary users on
 typical desktops can hardly distinguish between GNU/Linux and
 GNU/*BSD.&lt;/li&gt;
-
 &lt;/ol&gt;
-<span class="inserted"><ins><em>&lt;/div&gt;
-&lt;/div&gt;</em></ins></span>
+<span class="inserted"><ins><em>&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;
@@ -323,7 +339,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; <span class="removed"><del><strong>1997, 1998, 1999, 
2000, 2001, 2002,</strong></del></span> <span 
class="inserted"><ins><em>1997-2002,</em></ins></span> 2007, <span 
class="removed"><del><strong>2014, 2015, 2016</strong></del></span> <span 
class="inserted"><ins><em>2014-2017, 2019, 2021</em></ins></span> Richard M. 
Stallman&lt;/p&gt;
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>1997, 1998, 1999, 
2000, 2001, 2002,
+2007, 2014, 2015, 2016</strong></del></span> <span 
class="inserted"><ins><em>1997-2002, 2005, 2008, 2019, 2021</em></ins></span> 
Richard <span class="removed"><del><strong>M.</strong></del></span> 
Stallman&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
@@ -333,11 +350,12 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/30 19:03:10 $
+$Date: 2021/08/30 13:34:54 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-&lt;/div&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for class="inner", starts 
in the banner include --&gt;</em></ins></span>
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>

Index: gnu/po/linux-and-gnu.ca.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ca.po,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- gnu/po/linux-and-gnu.ca.po  30 May 2021 19:03:10 -0000      1.67
+++ gnu/po/linux-and-gnu.ca.po  30 Aug 2021 13:34:54 -0000      1.68
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2016-04-23 18:39+0200\n"
 "Last-Translator: Miquel Puigpelat <mpuigpe1@xtec.cat>\n"
 "Language-Team: Catalan <www-ca-traductors@gnu.org>\n"
@@ -40,33 +40,41 @@
 "usuaris tinguin la llibertat de compartir i millorar el programari que "
 "utilitzen."
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "Linux i el Sistema GNU"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 # | by <a href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a>
 #, fuzzy
 #| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "per <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"Per més informació vegeu les <a href=\"/gnu/gnu-linux-faq.html\">Preguntes "
-"freqüents sobre GNU/Linux</a> i l'article <a href=\"/gnu/why-gnu-linux.html"
-"\">Per què GNU/Linux?</a>"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many computer users run a modified version of <a
+# | href=\"/philosophy/categories.html#TheGNUsystem\">the GNU system</a> every
+# | day, without realizing it.  Through a peculiar turn of events, the version
+# | of GNU which is widely used today is often called [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and many of its users are <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> that it is
+# | basically the GNU system, developed by the <a
+# | href=\"/gnu/gnu-history.html\">GNU Project</a>.
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -81,6 +89,15 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"Per més informació vegeu les <a href=\"/gnu/gnu-linux-faq.html\">Preguntes "
+"freqüents sobre GNU/Linux</a> i l'article <a href=\"/gnu/why-gnu-linux.html"
+"\">Per què GNU/Linux?</a>"
+
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -100,10 +117,22 @@
 "és bàsicament GNU, amb Linux funcionant com a nucli. Totes les anomenades "
 "«Distribucions Linux» són en realitat distribucions de GNU/Linux."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many users do not understand the difference between the kernel, which is
+# | Linux, and the whole system, which they also call [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} The ambiguous use of the name doesn't help people
+# | understand.  These users often think that Linus Torvalds developed the
+# | whole operating system in 1991, with a bit of help.
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -114,7 +143,7 @@
 "Torvalds va desenvolupar tot el sistema operatiu el 1991, amb una mica "
 "d'ajuda."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -132,7 +161,7 @@
 "trobar que gairebé tot el que calia per a fer un sistema operatiu a l'estil "
 "d'Unix ja estava disponible."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free software</"
@@ -153,7 +182,7 @@
 "dels plans originals del sistema GNU. Quan Linux s'estava escrivint, el "
 "sistema estava gairebé acabat."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -171,10 +200,10 @@
 "aquests tipus de projectes pels programes específics que s'aporten al "
 "projecte."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | If we tried to measure the GNU Project's contribution in this way, what
 # | would we conclude? One CD-ROM vendor found that in their &ldquo;Linux
-# | distribution&rdquo;, <a
+# | [-distribution&rdquo;,-] {+distribution,&rdquo;+} <a
 # | href=\"/philosophy/categories.html#GNUsoftware\">GNU software</a> was the
 # | largest single contingent, around 28% of the total source code, and this
 # | included some of the essential major components without which there could
@@ -182,7 +211,7 @@
 # | similar: in the &ldquo;main&rdquo; repository of gNewSense, Linux is 1.5%
 # | and GNU packages are 15%.)+}  So if you were going to pick a name for the
 # | system based on who wrote the programs in the system, the most appropriate
-# | single choice would be &ldquo;GNU&rdquo;.
+# | single choice would be [-&ldquo;GNU&rdquo;.-] {+&ldquo;GNU.&rdquo;+}
 #, fuzzy
 #| msgid ""
 #| "If we tried to measure the GNU Project's contribution in this way, what "
@@ -197,14 +226,14 @@
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "Si intentéssim mesurar la contribució del Projecte GNU d'aquesta manera, 
què "
 "en podríem concloure? Un venedor de CD-ROMs hagués trobat que a la seva "
@@ -216,7 +245,7 @@
 "un nom per al sistema basant-se en qui va escriure els programes del "
 "sistema, el nom més apropiat seria «GNU»."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -233,7 +262,7 @@
 "intenció del Projecte GNU era la de desenvolupar <em>un sistema operatiu "
 "complet i lliure a l'estil d'Unix</em>: GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -262,7 +291,7 @@
 "a>. Fins i tot vam desenvolupar un joc d'escacs, GNU Chess, perquè un "
 "sistema complet també necessita jocs."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -278,11 +307,27 @@
 "hurd/hurd-and-linux.html\">el nucli GNU Hurd va començar a ser fiable el "
 "2001</a>, però encara falta per a què estigui llest per al públic en 
general."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once
+# | Torvalds freed Linux in 1992, it fit into the last major gap in the GNU
+# | system.  People could then <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | combine Linux with the GNU system</a> to make a complete free system
+# | &mdash; a version of the GNU system which also contained Linux.  The
+# | GNU/Linux system, in other words.
+#, fuzzy
+#| msgid ""
+#| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
+#| "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
+#| "system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+#| "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the "
+#| "GNU system</a> to make a complete free system &mdash; a version of the "
+#| "GNU system which also contained Linux.  The GNU/Linux system, in other "
+#| "words."
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -295,7 +340,7 @@
 "d'obtenir un sistema operatiu complet i lliure: una versió del sistema GNU "
 "que contenia Linux. En altres paraules, un sistema GNU/Linux."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -317,11 +362,25 @@
 "distribucions del sistema van fer una contribució cabdal. Però era una 
feina "
 "que segurament, per la seva naturalesa, l'hagués acabat fent algú."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU
+# | system.  The <a href=\"http{+s+}://fsf.org/\">FSF</a> funded the rewriting
+# | of the Linux-related extensions to the GNU C library, so that now they are
+# | well integrated, and the newest GNU/Linux systems use the current library
+# | release with no changes.  The FSF also funded an early stage of the
+# | development of Debian GNU/Linux.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -334,7 +393,7 @@
 "la biblioteca sense canvis. La FSF també va finançar els inicis del "
 "desenvolupament de la distribució Debian GNU/Linux."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Today there are many different variants of the GNU/Linux system (often
 # | called &ldquo;distros&rdquo;).  Most of them include [-non-free
 # | software&mdash;their-] {+nonfree programs&mdash;their+} developers follow
@@ -372,14 +431,31 @@
 "completament lliures</a>. La FSF dóna suport a <a href=\"http://gnewsense.";
 "org/\">gNewSense</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Making a free GNU/Linux distribution is not just a matter of eliminating
+# | various nonfree programs.  Nowadays, the usual version of Linux contains
+# | nonfree programs too.  These programs are intended to be loaded into I/O
+# | devices when the system starts, and they are included, as long series of
+# | numbers, in the \"source code\" of Linux.  Thus, maintaining free
+# | GNU/Linux distributions now entails maintaining a <a
+# | href=\"http{+s+}://directory.fsf.org/project/linux\"> free version of
+# | Linux</a> too.
+#, fuzzy
+#| msgid ""
+#| "Making a free GNU/Linux distribution is not just a matter of eliminating "
+#| "various nonfree programs.  Nowadays, the usual version of Linux contains "
+#| "nonfree programs too.  These programs are intended to be loaded into I/O "
+#| "devices when the system starts, and they are included, as long series of "
+#| "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/"
+#| "Linux distributions now entails maintaining a <a href=\"http://directory.";
+#| "fsf.org/project/linux\"> free version of Linux</a> too."
 msgid ""
 "Making a free GNU/Linux distribution is not just a matter of eliminating "
 "various nonfree programs.  Nowadays, the usual version of Linux contains "
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 "Convertir en lliure una distribució de GNU/Linux no consisteix només en "
@@ -390,13 +466,26 @@
 "de GNU/Linux implica ara també mantenir una <a href=\"http://directory.fsf.";
 "org/project/linux\"> versió lliure de Linux</a> "
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Whether you use GNU/Linux or not, please don't confuse the public by using
+# | the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the
+# | essential major components of the system.  The system as a whole is
+# | basically the GNU system, with Linux added.  When you're talking about
+# | this combination, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Tant si utilitzeu GNU/Linux com si no, no induïu a la confusió emprant la "
 "paraula «Linux» de forma ambigua. Linux és el nucli, un dels principals "
@@ -404,13 +493,29 @@
 "sistema GNU, amb Linux afegit. Quan parleu d'aquesta combinació, anomeneu-la 
"
 "si us plau «GNU/Linux»."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
+# | reference, this page and <a href=\"/gnu/the-gnu-project.html\">
+# | http{+s+}://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
+# | you mention Linux, the kernel, and want to add a link for further
+# | reference, <a
+# | [-href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a>-]
+# | {+href=\"https://foldoc.org/linux\";>https://foldoc.org/linux</a>+} is a
+# | good URL to use.
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "Si voleu posar un enllaç per oferir més informació sobre «GNU/Linux», "
 "aquesta pàgina i <a href=\"/gnu/the-gnu-project.html\">http://www.gnu.org/";
@@ -418,11 +523,11 @@
 "voleu posar un enllaç per oferir més informació, <a 
href=\"http://foldoc.org/";
 "linux\">http://foldoc.org/linux</a> és una bona adreça."
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr "Postdates"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Aside from GNU, one other project has independently produced a free Unix-"
 "like operating system.  This system is known as BSD, and it was developed at "
@@ -439,7 +544,7 @@
 "\"#newersystems\">(4)</a> són gairebé sempre variants del sistema GNU o del 
"
 "sistema BSD."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -462,54 +567,95 @@
 "ni el van afegir al sistema GNU, de manera que un nom com GNU/BSD no tindria "
 "sentit.&nbsp;<a href=\"#gnubsd\">(5)</a>"
 
-#. type: Content of: <div><div><h3>
-# | Notes[-:-]
+# type: Content of: <h4>
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Footnotes"
+msgid "Footnotes"
+msgstr "Notes"
+
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"unexciting\"></a>These-]{+These+} unexciting but essential
+# | components include the GNU assembler (GAS) and the linker (GLD), both are
+# | now part of the <a href=\"/software/binutils/\">GNU Binutils</a> package,
+# | <a href=\"/software/tar/\">GNU tar</a>, and many more.
 #, fuzzy
-#| msgid "Notes:"
-msgid "Notes"
-msgstr "Notes:"
-
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+#| msgid ""
+#| "<a id=\"unexciting\"></a>These unexciting but essential components "
+#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
+#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
+#| "\"/software/tar/\">GNU tar</a>, and many more."
+msgid ""
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\"></a>Aquests components essencials però poc atractius "
 "inclouen el compilador GNU GAS i l'enllaçador GLD, que ara són part dels "
 "paquets <a href=\"/software/binutils/\">GNU Binutils</a>), <a href=\"/"
 "software/tar/\">GNU tar</a> i d'altres."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"nottools\"></a>For-]{+For+} instance, The Bourne Again SHell
+# | (BASH), the PostScript interpreter <a
+# | href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the
+# | <a href=\"/software/libc/libc.html\">GNU C library</a> are not programming
+# | tools.  Neither are GNUCash, GNOME, and GNU Chess.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\"></a>Per exemple, la interfície Bash, l'intèrpret <a 
href="
 "\"/software/ghostscript/ghostscript.html\">Ghostscript</a> i la biblioteca "
 "<a href=\"/software/libc/libc.html\">GNU C library</a> no són eines de "
 "programació. El mateix passa amb GNUCash, GNOME i GNU Chess."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"somecomponents\"></a>For-]{+For+} instance, the <a
+# | href=\"/software/libc/libc.html\">GNU C library</a>.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\"></a>Per exemple, la biblioteca <a href=\"/software/"
 "libc/libc.html\">GNU C</a>."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"newersystems\"></a>Since-]{+Since+} that was written, a
+# | nearly-all-free Windows-like system has been developed, but technically it
+# | is not at all like GNU or Unix, so it doesn't really affect this issue. 
+# | Most of the kernel of Solaris has been made free, but if you wanted to
+# | make a free system out of that, aside from replacing the missing parts of
+# | the kernel, you would also need to put it into GNU or BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\"></a>Des que aquest article es va escriure, s'ha "
 "desenvolupat un sistema operatiu a l'estil de Windows gairebé lliure, però "
@@ -518,15 +664,31 @@
 "però si volguéssiu fer a partir d'ell un sistema lliure hauríeu 
d'integrar-"
 "lo amb GNU o BSD, a més d'afegir al nucli les parts que falten."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"gnubsd\"></a>On-]{+On+} the other hand, in the years since this
+# | article was written, the GNU C Library has been ported to several versions
+# | of the BSD kernel, which made it straightforward to combine the GNU system
+# | with that kernel.  Just as with GNU/Linux, these are indeed variants of
+# | GNU, and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD
+# | depending on the kernel of the system.  Ordinary users on typical desktops
+# | can hardly distinguish between GNU/Linux and GNU/*BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
+#| "was written, the GNU C Library has been ported to several versions of the "
+#| "BSD kernel, which made it straightforward to combine the GNU system with "
+#| "that kernel.  Just as with GNU/Linux, these are indeed variants of GNU, "
+#| "and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD "
+#| "depending on the kernel of the system.  Ordinary users on typical "
+#| "desktops can hardly distinguish between GNU/Linux and GNU/*BSD."
+msgid ""
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a id=\"gnubsd\"></a>Per altra banda, en els anys que han passat des que "
 "aquest article es va escriure, s'ha adaptat la biblioteca GNU C a algunes "
@@ -585,14 +747,13 @@
 "traducció al català del web de GNU."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; [-1997, 1998, 1999, 2000, 2001, 2002,-] {+1997-2002,+}
-# | 2007, [-2014, 2015, 2016-] {+2014-2017, 2019, 2021+} Richard M. Stallman
+# | Copyright &copy; [-1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014, 2015,
+# | 2016-] {+1997-2002, 2005, 2008, 2019, 2021+} Richard [-M.-] Stallman
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014, 2015, "
 #| "2016 Richard M. Stallman"
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014, 2015, 2016 "
 "Richard M. Stallman"
@@ -619,6 +780,11 @@
 msgid "Updated:"
 msgstr "Updated:"
 
+#, fuzzy
+#~| msgid "Notes:"
+#~ msgid "Notes"
+#~ msgstr "Notes:"
+
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"

Index: gnu/po/linux-and-gnu.cs.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.cs.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- gnu/po/linux-and-gnu.cs.po  7 Jun 2021 08:29:30 -0000       1.32
+++ gnu/po/linux-and-gnu.cs.po  30 Aug 2021 13:34:54 -0000      1.33
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2020-07-13 20:57+0100\n"
 "Last-Translator: František Kučera <franta-gnu AT frantovo.cz>\n"
 "Language-Team: Czech <www-cs-general@gnu.org>\n"
@@ -15,6 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "X-Generator: Lokalize 2.0\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
@@ -39,29 +40,37 @@
 "Od roku 1983 vyvíjíme svobodný operační systém unixového typu, aby 
uživatelé "
 "počítačů měli svobodu sdílet a vylepšovat software, který 
používají."
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "Linux a systém GNU"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "od <a href=\"https://www.stallman.org/\";>Richarda Stallmana</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"Pro více informací se podívejte také na <a href=\"/gnu/gnu-linux-faq.html"
-"\">GNU/Linux FAQ</a> a <a href=\"/gnu/why-gnu-linux.html\">Proč GNU/Linux?</"
-"a>"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many computer users run a modified version of <a
+# | href=\"/philosophy/categories.html#TheGNUsystem\">the GNU system</a> every
+# | day, without realizing it.  Through a peculiar turn of events, the version
+# | of GNU which is widely used today is often called [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and many of its users are <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> that it is
+# | basically the GNU system, developed by the <a
+# | href=\"/gnu/gnu-history.html\">GNU Project</a>.
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -75,6 +84,15 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"Pro více informací se podívejte také na <a href=\"/gnu/gnu-linux-faq.html"
+"\">GNU/Linux FAQ</a> a <a href=\"/gnu/why-gnu-linux.html\">Proč GNU/Linux?</"
+"a>"
+
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -94,10 +112,22 @@
 "Linux nebo GNU/Linux. Všechny tzv. „linuxové“ distribuce jsou ve 
skutečnosti "
 "distribuce GNU/Linuxu."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many users do not understand the difference between the kernel, which is
+# | Linux, and the whole system, which they also call [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} The ambiguous use of the name doesn't help people
+# | understand.  These users often think that Linus Torvalds developed the
+# | whole operating system in 1991, with a bit of help.
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -107,7 +137,7 @@
 "pochopení. Tito uživatelé si často myslí, že Linus Torvalds vyvinul 
celý "
 "operační systém v roce 1991 s trochou pomoci."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -125,7 +155,7 @@
 "že valná většina součástí potřebných k vytvoření unixového 
systému již je (z "
 "nějaké blíže nespecifikované příčiny) hotová."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free software</"
@@ -146,7 +176,7 @@
 "záměrů tohoto systému. V době, kdy byl napsán Linux, byl již tento 
systém "
 "téměř hotov."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -162,18 +192,42 @@
 "System). Je přirozené poměřovat příspěvky takovéhoto projektu podle "
 "specifických programů, které z projektu vzešly."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If we tried to measure the GNU Project's contribution in this way, what
+# | would we conclude? One CD-ROM vendor found that in their &ldquo;Linux
+# | [-distribution&rdquo;,-] {+distribution,&rdquo;+} <a
+# | href=\"/philosophy/categories.html#GNUsoftware\">GNU software</a> was the
+# | largest single contingent, around 28% of the total source code, and this
+# | included some of the essential major components without which there could
+# | be no system.  Linux itself was about 3%.  (The proportions in 2008 are
+# | similar: in the &ldquo;main&rdquo; repository of gNewSense, Linux is 1.5%
+# | and GNU packages are 15%.)  So if you were going to pick a name for the
+# | system based on who wrote the programs in the system, the most appropriate
+# | single choice would be [-&ldquo;GNU&rdquo;.-] {+&ldquo;GNU.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "If we tried to measure the GNU Project's contribution in this way, what "
+#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
+#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
+#| "\">GNU software</a> was the largest single contingent, around 28% of the "
+#| "total source code, and this included some of the essential major "
+#| "components without which there could be no system.  Linux itself was "
+#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
+#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
+#| "15%.)  So if you were going to pick a name for the system based on who "
+#| "wrote the programs in the system, the most appropriate single choice "
+#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "Pokud bychom se pokusili takto poměřovat příspěvky do GNU projektu, k 
čemu "
 "bychom došli? Jeden prodejce CD-ROM zjistil, že v jejich „linuxové "
@@ -185,7 +239,7 @@
 "a GNU balíčky 15 %) Pokud byste tedy vybírali název systému podle toho, 
kdo "
 "napsal jeho programy, nejvhodnější volbou by byl název „GNU“. "
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -201,7 +255,7 @@
 "přesto jsme jej vyvinuli. Cílem GNU projektu bylo vyvinout <em>kompletní "
 "svobodný systém podobný Unixu</em>: GNU. "
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -229,7 +283,7 @@
 "jsme dokonce šachovou hru GNU Chess, protože kompletní systém potřebuje 
i "
 "hry."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -245,11 +299,27 @@
 "spolehlivě pracovat v roce 2001</a>, ale má před sebou ještě dlouhou 
cestu, "
 "než bude připraven na běžné používání."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once
+# | Torvalds freed Linux in 1992, it fit into the last major gap in the GNU
+# | system.  People could then <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | combine Linux with the GNU system</a> to make a complete free system
+# | &mdash; a version of the GNU system which also contained Linux.  The
+# | GNU/Linux system, in other words.
+#, fuzzy
+#| msgid ""
+#| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
+#| "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
+#| "system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+#| "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the "
+#| "GNU system</a> to make a complete free system &mdash; a version of the "
+#| "GNU system which also contained Linux.  The GNU/Linux system, in other "
+#| "words."
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -261,7 +331,7 @@
 "vytvořili kompletní svobodný systém – verzi systému GNU, která 
obsahuje i "
 "Linux; nebo jinými slovy: systém GNU/Linux."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -282,11 +352,25 @@
 "vyvinuli různé distribuce tedy udělali významný kus práce. Ale byla to "
 "práce, která, z principu věci, musela být někým udělána."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU
+# | system.  The <a href=\"http{+s+}://fsf.org/\">FSF</a> funded the rewriting
+# | of the Linux-related extensions to the GNU C library, so that now they are
+# | well integrated, and the newest GNU/Linux systems use the current library
+# | release with no changes.  The FSF also funded an early stage of the
+# | development of Debian GNU/Linux.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -297,7 +381,7 @@
 "Linuxové systémy používají aktuální vydání knihovny bez 
dodatečných změn. "
 "FSF také financovala počáteční fáze vývoje distribuce Debian 
GNU/Linux."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Today there are many different variants of the GNU/Linux system (often "
 "called &ldquo;distros&rdquo;).  Most of them include nonfree programs&mdash;"
@@ -317,14 +401,31 @@
 "svobodné distribuce GNU/Linuxu</a>. FSF poskytuje technické zázemí pro "
 "některé z nich."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Making a free GNU/Linux distribution is not just a matter of eliminating
+# | various nonfree programs.  Nowadays, the usual version of Linux contains
+# | nonfree programs too.  These programs are intended to be loaded into I/O
+# | devices when the system starts, and they are included, as long series of
+# | numbers, in the \"source code\" of Linux.  Thus, maintaining free
+# | GNU/Linux distributions now entails maintaining a <a
+# | href=\"http{+s+}://directory.fsf.org/project/linux\"> free version of
+# | Linux</a> too.
+#, fuzzy
+#| msgid ""
+#| "Making a free GNU/Linux distribution is not just a matter of eliminating "
+#| "various nonfree programs.  Nowadays, the usual version of Linux contains "
+#| "nonfree programs too.  These programs are intended to be loaded into I/O "
+#| "devices when the system starts, and they are included, as long series of "
+#| "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/"
+#| "Linux distributions now entails maintaining a <a href=\"http://directory.";
+#| "fsf.org/project/linux\"> free version of Linux</a> too."
 msgid ""
 "Making a free GNU/Linux distribution is not just a matter of eliminating "
 "various nonfree programs.  Nowadays, the usual version of Linux contains "
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 "Dělat svobodnou distribuci GNU/Linuxu není jen o odstraňování různých "
@@ -335,26 +436,55 @@
 "Linuxové distribuce zahrnuje i udržování <a 
href=\"http://directory.fsf.org/";
 "project/linux\">svobodné verze Linuxu</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Whether you use GNU/Linux or not, please don't confuse the public by using
+# | the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the
+# | essential major components of the system.  The system as a whole is
+# | basically the GNU system, with Linux added.  When you're talking about
+# | this combination, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Ať už používáte GNU/Linux nebo ne, nepleťte prosím veřejnost 
dvojsmyslným "
 "používáním termínu „Linux“. Linux je jádro, jedna ze základních 
součástí "
 "systému. Systém jako celkem je víceméně GNU systém s přidaným 
Linuxem. Když "
 "mluvíte o této kombinaci, nazývejte ji prosím „GNU/Linux“."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
+# | reference, this page and <a href=\"/gnu/the-gnu-project.html\">
+# | http{+s+}://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
+# | you mention Linux, the kernel, and want to add a link for further
+# | reference, <a
+# | [-href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a>-]
+# | {+href=\"https://foldoc.org/linux\";>https://foldoc.org/linux</a>+} is a
+# | good URL to use.
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "Pokud chcete odkazovat na další informace o „GNU/Linuxu“, tato stránka 
a <a "
 "href=\"/gnu/the-gnu-project.html\">http://www.gnu.org/gnu/the-gnu-project.";
@@ -362,11 +492,11 @@
 "odkaz, <a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> je "
 "dobrá adresa."
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr "Dodatky"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Aside from GNU, one other project has independently produced a free Unix-"
 "like operating system.  This system is known as BSD, and it was developed at "
@@ -382,7 +512,7 @@
 "href=\"#newersystems\">(4)</a> jsou variantou systému GNU nebo odrůdou BSD "
 "systému."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -403,51 +533,94 @@
 "odděleně. Vývojáři BSD nenapsali jádro a nepřidali ho ke GNU systému, 
takže "
 "označení GNU/BSD tuto situaci nevystihuje. <a href=\"#gnubsd\">(5)</a>"
 
-#. type: Content of: <div><div><h3>
-msgid "Notes"
-msgstr "Poznámky"
-
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Footnotes"
+msgid "Footnotes"
+msgstr "Poznámky pod čarou"
+
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"unexciting\"></a>These-]{+These+} unexciting but essential
+# | components include the GNU assembler (GAS) and the linker (GLD), both are
+# | now part of the <a href=\"/software/binutils/\">GNU Binutils</a> package,
+# | <a href=\"/software/tar/\">GNU tar</a>, and many more.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"unexciting\"></a>These unexciting but essential components "
+#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
+#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
+#| "\"/software/tar/\">GNU tar</a>, and many more."
+msgid ""
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\"></a>Tyto nezábavné, ale zásadní, komponenty 
zahrnují "
 "GNU assembler (GAS) a spojovací program (GLD), které jsou součástí 
balíčku "
 "<a href=\"/software/binutils/\">GNU Binutils</a>, balíček  <a href=\"/"
 "software/tar/\">GNU tar</a> a další."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"nottools\"></a>For-]{+For+} instance, The Bourne Again SHell
+# | (BASH), the PostScript interpreter <a
+# | href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the
+# | <a href=\"/software/libc/libc.html\">GNU C library</a> are not programming
+# | tools.  Neither are GNUCash, GNOME, and GNU Chess.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\"></a>Např. Bourne Again SHell (BASH), interpret "
 "PostScriptu <a href=\"/software/ghostscript/ghostscript.html\">Ghostscript</"
 "a> a knihovna <a href=\"/software/libc/libc.html\">GNU C library</a> nejsou "
 "programátorské nástroje. Stejně jako GNUCash, GNOME nebo GNU Chess."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"somecomponents\"></a>For-]{+For+} instance, the <a
+# | href=\"/software/libc/libc.html\">GNU C library</a>.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\"></a>Např. knihovna <a href=\"/software/libc/libc."
 "html\">GNU C library</a>."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"newersystems\"></a>Since-]{+Since+} that was written, a
+# | nearly-all-free Windows-like system has been developed, but technically it
+# | is not at all like GNU or Unix, so it doesn't really affect this issue. 
+# | Most of the kernel of Solaris has been made free, but if you wanted to
+# | make a free system out of that, aside from replacing the missing parts of
+# | the kernel, you would also need to put it into GNU or BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\"></a>Od dob, co bylo toto napsáno, vznikl 
téměř-zcela-"
 "svobodný systém windowsového typu, ale technicky je to něco úplně 
jiného než "
@@ -456,15 +629,31 @@
 "doplnění chybějících částí jádra byste museli toto jádro začlenit 
do GNU "
 "nebo BSD."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"gnubsd\"></a>On-]{+On+} the other hand, in the years since this
+# | article was written, the GNU C Library has been ported to several versions
+# | of the BSD kernel, which made it straightforward to combine the GNU system
+# | with that kernel.  Just as with GNU/Linux, these are indeed variants of
+# | GNU, and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD
+# | depending on the kernel of the system.  Ordinary users on typical desktops
+# | can hardly distinguish between GNU/Linux and GNU/*BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
+#| "was written, the GNU C Library has been ported to several versions of the "
+#| "BSD kernel, which made it straightforward to combine the GNU system with "
+#| "that kernel.  Just as with GNU/Linux, these are indeed variants of GNU, "
+#| "and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD "
+#| "depending on the kernel of the system.  Ordinary users on typical "
+#| "desktops can hardly distinguish between GNU/Linux and GNU/*BSD."
+msgid ""
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a id=\"gnubsd\"></a>Na druhou stranu, od doby vydání tohoto článku byla "
 "knihovna GNU C Library portována na řadu verzí BSD jádra, což umožnilo "
@@ -517,8 +706,13 @@
 "se dozvíte, jak koordinovat svoji práci a posílat překlady tohoto 
článku."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+# | Copyright &copy; 1997-2002, [-2007, 2014-2017,-] {+2005, 2008,+} 2019,
+# | 2021 Richard [-M.-] Stallman
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. "
+#| "Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
 
@@ -542,6 +736,9 @@
 msgid "Updated:"
 msgstr "Aktualizováno:"
 
+#~ msgid "Notes"
+#~ msgstr "Poznámky"
+
 #~ msgid "What's New"
 #~ msgstr "Co je nového"
 

Index: gnu/po/linux-and-gnu.de-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.de-diff.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gnu/po/linux-and-gnu.de-diff.html   8 Jun 2021 08:44:38 -0000       1.6
+++ gnu/po/linux-and-gnu.de-diff.html   30 Aug 2021 13:34:54 -0000      1.7
@@ -10,44 +10,49 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.84</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&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.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;Linux and GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU 
HURD, Hurd" /&gt;
 &lt;meta http-equiv="Description" content="Since 1983, developing the free 
Unix style operating system GNU, so that computer users can have the freedom to 
share and improve the software they use." /&gt;
 &lt;!--#include virtual="/gnu/po/linux-and-gnu.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;Linux</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;Linux</em></ins></span> 
and the GNU System&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;Linux and the GNU System&lt;/h2&gt;
 
-<span 
class="removed"><del><strong>&lt;p&gt;&lt;strong&gt;by</strong></del></span>
+<span class="removed"><del><strong>&lt;p&gt;&lt;strong&gt;by &lt;a 
href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;address class="byline 
c"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
-<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;
-
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;For</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;For</em></ins></span> more 
information see also
-the &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;,
+  &lt;blockquote&gt;&lt;p&gt;For more information see also
+the</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;address 
class="byline"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux 
FAQ&lt;/a&gt;,
 and &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;&lt;/p&gt;
-  <span class="removed"><del><strong>&lt;/blockquote&gt;</strong></del></span>
-&lt;/div&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;
+  &lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;
 Many computer users run a modified version of
 &lt;a href="/philosophy/categories.html#TheGNUsystem"&gt;the GNU 
system&lt;/a&gt;
 every day, without realizing it.  Through a peculiar turn of events,
 the version of GNU which is widely used today is often called
-&ldquo;Linux&rdquo;, and many of its users
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> and 
many of its users
 are &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt; not aware&lt;/a&gt;
 that it is basically the GNU system, developed by the
 &lt;a href="/gnu/gnu-history.html"&gt;GNU Project&lt;/a&gt;.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;div class="announcement comment" 
role="complementary"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;p&gt;For more information see also
+the &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;,
+and &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;</em></ins></span>
+
 &lt;p&gt;
 There really is a Linux, and these people are using it, but it is just
 a part of the system they use.  Linux is the kernel: the program in
@@ -63,7 +68,8 @@
 &lt;p&gt;
 Many users do not understand the difference between the kernel, which
 is Linux, and the whole system, which they also call
-&ldquo;Linux&rdquo;.  The ambiguous use of the name doesn't help
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  The 
ambiguous use of the name doesn't help
 people understand.  These users often think that Linus Torvalds
 developed the whole operating system in 1991, with a bit of help.&lt;/p&gt;
 
@@ -100,7 +106,8 @@
 &lt;p&gt;
 If we tried to measure the GNU Project's contribution in this way,
 what would we conclude?  One CD-ROM vendor found that in their &ldquo;Linux
-distribution&rdquo;, &lt;a 
href="/philosophy/categories.html#GNUsoftware"&gt;GNU
+<span class="removed"><del><strong>distribution&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>distribution,&rdquo;</em></ins></span> &lt;a 
href="/philosophy/categories.html#GNUsoftware"&gt;GNU
 software&lt;/a&gt; was the largest single contingent, around 28% of the
 total source code, and this included some of the essential major
 components without which there could be no system.  Linux itself was
@@ -108,7 +115,7 @@
 repository of gNewSense, Linux is 1.5% and GNU packages are 15%.)
 So if you were going to pick a name for the system based on
 who wrote the programs in the system, the most appropriate single
-choice would be &ldquo;GNU&rdquo;.&lt;/p&gt;
+choice would be <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU.&rdquo;&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
 But that is not the deepest way to consider the question.  The GNU
@@ -147,7 +154,7 @@
 Fortunately, we didn't have to wait for the Hurd, because of Linux.
 Once Torvalds freed Linux in 1992, it fit into the last major gap in
 the GNU system.  People could
-then &lt;a 
href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+then &lt;a <span 
class="removed"><del><strong>href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
 combine Linux with the GNU system&lt;/a&gt; to make a complete free system
 &mdash; a version of the GNU system which also contained Linux.  The
 GNU/Linux system, in other words.&lt;/p&gt;
@@ -165,7 +172,7 @@
 
 &lt;p&gt;
 The GNU Project supports GNU/Linux systems as well as &lt;em&gt;the&lt;/em&gt; 
GNU
-system.  The &lt;a href="http://fsf.org/"&gt;FSF&lt;/a&gt; funded the 
rewriting of
+system.  The &lt;a <span 
class="removed"><del><strong>href="http://fsf.org/"&gt;FSF&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://fsf.org/"&gt;FSF&lt;/a&gt;</em></ins></span>
 funded the rewriting of
 the Linux-related extensions to the GNU C library, so that now they
 are well integrated, and the newest GNU/Linux systems use the current
 library release with no changes.  The FSF also funded an early stage
@@ -189,7 +196,7 @@
 be loaded into I/O devices when the system starts, and they are
 included, as long series of numbers, in the "source code" of Linux.
 Thus, maintaining free GNU/Linux distributions now entails maintaining
-a &lt;a href="http://directory.fsf.org/project/linux"&gt; free version of
+a &lt;a <span 
class="removed"><del><strong>href="http://directory.fsf.org/project/linux"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://directory.fsf.org/project/linux"&gt;</em></ins></span>
 free version of
 Linux&lt;/a&gt; too.&lt;/p&gt;
 
 &lt;p&gt;Whether you use GNU/Linux or not, please don't confuse the public
@@ -197,14 +204,16 @@
 kernel, one of the essential major components of the system.  The
 system as a whole is basically the GNU system, with Linux added.  When
 you're talking about this combination, please call it
-&ldquo;GNU/Linux&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.&lt;/p&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
 If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
 reference, this page and &lt;a href="/gnu/the-gnu-project.html"&gt;
-http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt; are good choices.  If
+<span 
class="removed"><del><strong>http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>https://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</em></ins></span>
 are good choices.  If
 you mention Linux, the kernel, and want to add a link for further
-reference, &lt;a 
href="http://foldoc.org/linux"&gt;http://foldoc.org/linux&lt;/a&gt; 
+reference, &lt;a <span 
class="removed"><del><strong>href="http://foldoc.org/linux"&gt;http://foldoc.org/linux&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://foldoc.org/linux"&gt;https://foldoc.org/linux&lt;/a&gt;</em></ins></span>
 
 is a good URL to use.&lt;/p&gt;
 
 <span 
class="removed"><del><strong>&lt;h3&gt;Postscripts&lt;/h3&gt;</strong></del></span>
@@ -235,35 +244,44 @@
 <span 
class="removed"><del><strong>&lt;h3&gt;Notes:&lt;/h3&gt;</strong></del></span>
 <span class="inserted"><ins><em>&lt;div class="column-limit"&gt;&lt;/div&gt;
 
-&lt;h3 class="footnote"&gt;Notes&lt;/h3&gt;</em></ins></span>
+&lt;h3 class="footnote"&gt;Footnotes&lt;/h3&gt;</em></ins></span>
 &lt;ol&gt;
-&lt;li&gt;
-&lt;a id="unexciting"&gt;&lt;/a&gt;These unexciting but essential components
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="unexciting"&gt;&lt;/a&gt;These</strong></del></span>
+<span class="inserted"><ins><em>&lt;li 
id="unexciting"&gt;These</em></ins></span> unexciting but essential components
 include the GNU assembler (GAS) and the linker (GLD), both
 are now part of the &lt;a href="/software/binutils/"&gt;GNU Binutils&lt;/a&gt;
 package, &lt;a href="/software/tar/"&gt;GNU tar&lt;/a&gt;, and many 
more.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="nottools"&gt;&lt;/a&gt;For instance, The Bourne Again SHell (BASH),
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="nottools"&gt;&lt;/a&gt;For</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li id="nottools"&gt;For</em></ins></span> 
instance, The Bourne Again SHell (BASH),
 the PostScript interpreter
 &lt;a href="/software/ghostscript/ghostscript.html"&gt;Ghostscript&lt;/a&gt;, 
and the
 &lt;a href="/software/libc/libc.html"&gt;GNU C library&lt;/a&gt; are not
 programming tools.  Neither are GNUCash, GNOME, and GNU Chess.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="somecomponents"&gt;&lt;/a&gt;For instance, the
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="somecomponents"&gt;&lt;/a&gt;For</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li 
id="somecomponents"&gt;For</em></ins></span> instance, the
 &lt;a href="/software/libc/libc.html"&gt;GNU C library&lt;/a&gt;.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="newersystems"&gt;&lt;/a&gt;Since that was written, a nearly-all-free
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="newersystems"&gt;&lt;/a&gt;Since</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li 
id="newersystems"&gt;Since</em></ins></span> that was written, a nearly-all-free
 Windows-like system has been developed, but technically it is not at
 all like GNU or Unix, so it doesn't really affect this issue.  Most of
 the kernel of Solaris has been made free, but if you wanted to make a
 free system out of that, aside from replacing the missing parts of the
 kernel, you would also need to put it into GNU or BSD.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="gnubsd"&gt;&lt;/a&gt;On the other hand, in the years since this 
article
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="gnubsd"&gt;&lt;/a&gt;On</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li id="gnubsd"&gt;On</em></ins></span> the 
other hand, in the years since this article
 was written, the GNU C Library has been ported to several versions of
 the BSD kernel, which made it straightforward to combine the GNU system
 with that kernel.  Just as with GNU/Linux, these are indeed variants of
@@ -271,10 +289,8 @@
 GNU/kNetBSD depending on the kernel of the system.  Ordinary users on
 typical desktops can hardly distinguish between GNU/Linux and
 GNU/*BSD.&lt;/li&gt;
-
 &lt;/ol&gt;
-<span class="inserted"><ins><em>&lt;/div&gt;
-&lt;/div&gt;</em></ins></span>
+<span class="inserted"><ins><em>&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;
@@ -323,7 +339,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; <span class="removed"><del><strong>1997, 1998, 1999, 
2000, 2001, 2002,</strong></del></span> <span 
class="inserted"><ins><em>1997-2002,</em></ins></span> 2007, <span 
class="removed"><del><strong>2014, 2015, 2016, 2017</strong></del></span> <span 
class="inserted"><ins><em>2014-2017, 2019, 2021</em></ins></span> Richard M. 
Stallman&lt;/p&gt;
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>1997, 1998, 1999, 
2000, 2001, 2002,
+2007, 2014, 2015, 2016, 2017</strong></del></span> <span 
class="inserted"><ins><em>1997-2002, 2005, 2008, 2019, 2021</em></ins></span> 
Richard <span class="removed"><del><strong>M.</strong></del></span> 
Stallman&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
@@ -333,11 +350,12 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/06/08 08:44:38 $
+$Date: 2021/08/30 13:34:54 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-&lt;/div&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for class="inner", starts 
in the banner include --&gt;</em></ins></span>
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>

Index: gnu/po/linux-and-gnu.de.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.de.po,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- gnu/po/linux-and-gnu.de.po  31 May 2021 13:39:47 -0000      1.48
+++ gnu/po/linux-and-gnu.de.po  30 Aug 2021 13:34:54 -0000      1.49
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
 "Report-Msgid-Bugs-To: Webmasters <webmasters@gnu.org>\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2017-09-26 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"
@@ -39,11 +39,11 @@
 # bezieht, missverständlich. Besser wäre
 # 'Das GNU-System und Linux' oder -kürzer- schlicht 'GNU und Linux'
 # (was auch GNU, an erster Stelle stehend, in den Vordergrund hebt)
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "Das GNU-System und Linux"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 # | by <a href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a>
 #, fuzzy
 #| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
@@ -51,21 +51,29 @@
 msgstr ""
 "von <strong><a href=\"//www.stallman.org/\">Richard Stallman</a></strong>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"Siehe auch <cite><a href=\"/gnu/gnu-linux-faq\">GNU/Linux: Häufig gestellte "
-"Fragen</a></cite> und <cite><a href=\"/gnu/why-gnu-linux\">GNU/Linux. Ist "
-"der Name Schall und Rauch?</a></cite> für weitere Informationen."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many computer users run a modified version of <a
+# | href=\"/philosophy/categories.html#TheGNUsystem\">the GNU system</a> every
+# | day, without realizing it.  Through a peculiar turn of events, the version
+# | of GNU which is widely used today is often called [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and many of its users are <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> that it is
+# | basically the GNU system, developed by the <a
+# | href=\"/gnu/gnu-history.html\">GNU Project</a>.
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -81,6 +89,15 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"Siehe auch <cite><a href=\"/gnu/gnu-linux-faq\">GNU/Linux: Häufig gestellte "
+"Fragen</a></cite> und <cite><a href=\"/gnu/why-gnu-linux\">GNU/Linux. Ist "
+"der Name Schall und Rauch?</a></cite> für weitere Informationen."
+
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -102,10 +119,22 @@
 "All die sogenannten „Linux“-Distributionen sind tatsächlich GNU/Linux-"
 "Distributionen."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many users do not understand the difference between the kernel, which is
+# | Linux, and the whole system, which they also call [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} The ambiguous use of the name doesn't help people
+# | understand.  These users often think that Linus Torvalds developed the
+# | whole operating system in 1991, with a bit of help.
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -116,7 +145,7 @@
 "Benutzer denken oftmals, dass Linus Torvalds das gesamte Betriebssystem 1991 "
 "mit ein bisschen Hilfe entwickelte."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -136,7 +165,7 @@
 "heraus, dass (aus keinem besonderen Grund) fast alles für ein unixoides "
 "System Notwendige bereits vorhanden war."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free software</"
@@ -158,7 +187,7 @@
 "ursprünglichen Pläne für das GNU-System. Als mit Linux begonnen wurde, war 
"
 "GNU fast fertig."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -175,18 +204,42 @@
 "natürlich, den Beitrag dieser Art von Projekt an bestimmten Programmen zu "
 "messen, die daraus stammen."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If we tried to measure the GNU Project's contribution in this way, what
+# | would we conclude? One CD-ROM vendor found that in their &ldquo;Linux
+# | [-distribution&rdquo;,-] {+distribution,&rdquo;+} <a
+# | href=\"/philosophy/categories.html#GNUsoftware\">GNU software</a> was the
+# | largest single contingent, around 28% of the total source code, and this
+# | included some of the essential major components without which there could
+# | be no system.  Linux itself was about 3%.  (The proportions in 2008 are
+# | similar: in the &ldquo;main&rdquo; repository of gNewSense, Linux is 1.5%
+# | and GNU packages are 15%.)  So if you were going to pick a name for the
+# | system based on who wrote the programs in the system, the most appropriate
+# | single choice would be [-&ldquo;GNU&rdquo;.-] {+&ldquo;GNU.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "If we tried to measure the GNU Project's contribution in this way, what "
+#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
+#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
+#| "\">GNU software</a> was the largest single contingent, around 28% of the "
+#| "total source code, and this included some of the essential major "
+#| "components without which there could be no system.  Linux itself was "
+#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
+#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
+#| "15%.)  So if you were going to pick a name for the system based on who "
+#| "wrote the programs in the system, the most appropriate single choice "
+#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "Zu welchem Schluss würden wir bei dem Versuch kommen, den Beitrag des GNU-"
 "Projekts danach zu messen? Ein CD-ROM-Anbieter fand heraus, dass in deren "
@@ -200,7 +253,7 @@
 "wer die Programme im System geschrieben hat, wäre die entsprechende einzige "
 "Antwort <em>GNU</em>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -218,7 +271,7 @@
 "GNU."
 
 # ab hier Korrekturlesen, 2.5.2013
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -249,7 +302,7 @@
 "class=\"fnote\">(2)</a> sind. Wir entwickelten sogar ein Schachspiel, GNU "
 "Chess, weil ein Gesamtsystem auch Spiele braucht."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -266,11 +319,27 @@
 "zuverlässig zu arbeiten</a>, aber ist weit davon entfernt, allgemein "
 "benutzbar zu sein."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once
+# | Torvalds freed Linux in 1992, it fit into the last major gap in the GNU
+# | system.  People could then <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | combine Linux with the GNU system</a> to make a complete free system
+# | &mdash; a version of the GNU system which also contained Linux.  The
+# | GNU/Linux system, in other words.
+#, fuzzy
+#| msgid ""
+#| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
+#| "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
+#| "system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+#| "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the "
+#| "GNU system</a> to make a complete free system &mdash; a version of the "
+#| "GNU system which also contained Linux.  The GNU/Linux system, in other "
+#| "words."
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -284,7 +353,7 @@
 "&#160;eine Variante des GNU-Systems, das auch Linux enthielt. Mit anderen "
 "Worten: das GNU/Linux-System."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -309,11 +378,25 @@
 "&#160;in der Natur der Sache&#160;&#8209;&#160;sicher war, von jemand "
 "erledigt zu werden."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU
+# | system.  The <a href=\"http{+s+}://fsf.org/\">FSF</a> funded the rewriting
+# | of the Linux-related extensions to the GNU C library, so that now they are
+# | well integrated, and the newest GNU/Linux systems use the current library
+# | release with no changes.  The FSF also funded an early stage of the
+# | development of Debian GNU/Linux.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -327,7 +410,7 @@
 "FSF unterstützte auch ein frühes Entwicklungsstadium von Debian GNU/Linux "
 "finanziell."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Today there are many different variants of the GNU/Linux system (often
 # | called &ldquo;distros&rdquo;).  Most of them include [-non-free
 # | software&mdash;their-] {+nonfree programs&mdash;their+} developers follow
@@ -366,15 +449,15 @@
 "FSF unterstützt <a href=\"//gnewsense.org/\" title=\"http://gnewsense.org/";
 "\">gNewSense</a> mit EDV-Fa­zi­li­täten."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Making a free GNU/Linux distribution is not just a matter of eliminating
 # | various non[---]free programs.  Nowadays, the usual version of Linux
 # | contains non[---]free programs too.  These programs are intended to be
 # | loaded into I/O devices when the system starts, and they are included, as
 # | long series of numbers, in the \"source code\" of Linux.  Thus,
 # | maintaining free GNU/Linux distributions now entails maintaining a <a
-# | href=\"http://directory.fsf.org/project/linux\";> free version of Linux</a>
-# | too.
+# | href=\"http{+s+}://directory.fsf.org/project/linux\"> free version of
+# | Linux</a> too.
 #, fuzzy
 #| msgid ""
 #| "Making a free GNU/Linux distribution is not just a matter of eliminating "
@@ -390,7 +473,7 @@
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 "Eine freie GNU/Linux-Distribution ist nicht nur eine Frage der Beseitigung "
@@ -401,13 +484,26 @@
 "Linux-Distributionen nun ebenfalls die Pflege einer <a href=\"//directory."
 "fsf.org/project/linux-libre\">freien Variante von Linux</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Whether you use GNU/Linux or not, please don't confuse the public by using
+# | the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the
+# | essential major components of the system.  The system as a whole is
+# | basically the GNU system, with Linux added.  When you're talking about
+# | this combination, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Ob Sie GNU/Linux benutzen oder nicht, bitte irritieren Sie die "
 "Öffentlichkeit nicht durch doppeldeutigen Gebrauch des Namens „Linux“. 
Linux "
@@ -417,13 +513,29 @@
 "sprechen, nennen Sie es bitte <i><b>GNU/Linux</b></i>."
 
 # (Service Temporarily Unavailable) -> 
https://web.archive.org/web/20091004063519/http://foldoc.org/Linux
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
+# | reference, this page and <a href=\"/gnu/the-gnu-project.html\">
+# | http{+s+}://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
+# | you mention Linux, the kernel, and want to add a link for further
+# | reference, <a
+# | [-href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a>-]
+# | {+href=\"https://foldoc.org/linux\";>https://foldoc.org/linux</a>+} is a
+# | good URL to use.
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "Möchten Sie zu Referenzzwecken einen Verweis auf <em>GNU/Linux</em> anlegen, 
"
 "ist sowohl dieses Dokument als auch <a href=\"/gnu/the-gnu-project\">https://";
@@ -432,11 +544,11 @@
 "weitere Referenz hinzufügen, ist <a href=\"//foldoc.org/linux\">http://";
 "foldoc.org/linux</a> eine gute Adresse."
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr "Nachtrag"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Aside from GNU, one other project has independently produced a free
 # | Unix-like operating system.  This system is known as BSD, and it was
 # | developed at UC Berkeley.  It was non[---]free in the 80s, but became free
@@ -468,7 +580,7 @@
 "höchstwahrscheinlich entweder eine Variante des GNU-Systems oder eine Art "
 "von BSD-System."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -492,19 +604,26 @@
 "Situation<a href=\"#gnubsd\" id=\"gnubsd-ref\" class=\"fnote\">(5)</a> nicht "
 "gerecht werden."
 
-#. type: Content of: <div><div><h3>
-# | Notes[-:-]
+#. type: Content of: <div><h3>
+msgid "Footnotes"
+msgstr "Fußnoten"
+
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"unexciting\"></a>These-]{+These+} unexciting but essential
+# | components include the GNU assembler (GAS) and the linker (GLD), both are
+# | now part of the <a href=\"/software/binutils/\">GNU Binutils</a> package,
+# | <a href=\"/software/tar/\">GNU tar</a>, and many more.
 #, fuzzy
-#| msgid "Notes:"
-msgid "Notes"
-msgstr "Anmerkungen:"
-
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+#| msgid ""
+#| "<a id=\"unexciting\"></a>These unexciting but essential components "
+#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
+#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
+#| "\"/software/tar/\">GNU tar</a>, and many more."
+msgid ""
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\" href=\"#unexciting-ref\">↗</a> Diese wenig aufregenden 
"
 "aber wesentlichen Komponenten umfassen den <b>GNU Assembler</b> (GAS) und "
@@ -512,13 +631,24 @@
 "binutils/\">GNU Binary Utilities</a></b>, <b><a href=\"/software/tar/\">GNU "
 "Tar</a></b> und vielen weiteren Paketen."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"nottools\"></a>For-]{+For+} instance, The Bourne Again SHell
+# | (BASH), the PostScript interpreter <a
+# | href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the
+# | <a href=\"/software/libc/libc.html\">GNU C library</a> are not programming
+# | tools.  Neither are GNUCash, GNOME, and GNU Chess.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\" href=\"#nottools-ref\">↗</a> Beispielsweise sind die "
 "<b><a href=\"/software/bash/\">Bourne Again SHell</a></b> (BASH), der "
@@ -527,22 +657,41 @@
 "Programmierwerkzeuge. Auch <b>GnuCash</b>, <b>Gnome</b> und <b>Chess</b> "
 "nicht."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"somecomponents\"></a>For-]{+For+} instance, the <a
+# | href=\"/software/libc/libc.html\">GNU C library</a>.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\" href=\"#somecomponents-ref\">↗</a> Beispielsweise "
 "die <b><a href=\"/software/libc/\">C</a></b>-Bibliothek."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"newersystems\"></a>Since-]{+Since+} that was written, a
+# | nearly-all-free Windows-like system has been developed, but technically it
+# | is not at all like GNU or Unix, so it doesn't really affect this issue. 
+# | Most of the kernel of Solaris has been made free, but if you wanted to
+# | make a free system out of that, aside from replacing the missing parts of
+# | the kernel, you would also need to put it into GNU or BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\" href=\"#newersystems-ref\">↗</a> Seitdem dieser Text 
"
 "verfasst wurde, ist ein nahezu-freies, Windows-ähnliches System entwickelt "
@@ -553,15 +702,31 @@
 "fehlenden Teile des Systemkerns, würde man es auch bei GNU oder BSD machen "
 "müssen."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"gnubsd\"></a>On-]{+On+} the other hand, in the years since this
+# | article was written, the GNU C Library has been ported to several versions
+# | of the BSD kernel, which made it straightforward to combine the GNU system
+# | with that kernel.  Just as with GNU/Linux, these are indeed variants of
+# | GNU, and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD
+# | depending on the kernel of the system.  Ordinary users on typical desktops
+# | can hardly distinguish between GNU/Linux and GNU/*BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
+#| "was written, the GNU C Library has been ported to several versions of the "
+#| "BSD kernel, which made it straightforward to combine the GNU system with "
+#| "that kernel.  Just as with GNU/Linux, these are indeed variants of GNU, "
+#| "and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD "
+#| "depending on the kernel of the system.  Ordinary users on typical "
+#| "desktops can hardly distinguish between GNU/Linux and GNU/*BSD."
+msgid ""
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a id=\"gnubsd\" href=\"#gnubsd-ref\">↗</a> Auf der anderen Seite wurde in "
 "den Jahren seit dieser Artikel verfasst wurde, die GNU C-Bibliothek auf "
@@ -632,14 +797,13 @@
 "standards/README.translations\">LIESMICH für Übersetzungen</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; [-1997, 1998, 1999, 2000, 2001, 2002,-] {+1997-2002,+}
-# | 2007, [-2014-] {+2014-2017, 2019, 2021+} Richard M. Stallman
+# | Copyright &copy; [-1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014-]
+# | {+1997-2002, 2005, 2008, 2019, 2021+} Richard [-M.-] Stallman
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014 Richard "
 #| "M. Stallman"
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014 Richard M. "
 "Stallman."
@@ -667,6 +831,11 @@
 msgid "Updated:"
 msgstr "Letzte Änderung:"
 
+#, fuzzy
+#~| msgid "Notes:"
+#~ msgid "Notes"
+#~ msgstr "Anmerkungen:"
+
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"

Index: gnu/po/linux-and-gnu.el-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.el-diff.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gnu/po/linux-and-gnu.el-diff.html   8 Jun 2021 08:44:38 -0000       1.16
+++ gnu/po/linux-and-gnu.el-diff.html   30 Aug 2021 13:34:54 -0000      1.17
@@ -10,44 +10,49 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.79</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.79</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;Linux and GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU 
HURD, Hurd" /&gt;
 &lt;meta http-equiv="Description" content="Since 1983, developing the free 
Unix style operating system GNU, so that computer users can have the freedom to 
share and improve the software they use." /&gt;
 &lt;!--#include virtual="/gnu/po/linux-and-gnu.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;Linux</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;Linux</em></ins></span> 
and the GNU System&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;Linux and the GNU System&lt;/h2&gt;
 
-<span 
class="removed"><del><strong>&lt;p&gt;&lt;strong&gt;by</strong></del></span>
+<span class="removed"><del><strong>&lt;p&gt;&lt;strong&gt;by &lt;a 
href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;address class="byline 
c"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
-<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;
-
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;For</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;For</em></ins></span> more 
information see also
-the &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;,
+  &lt;blockquote&gt;&lt;p&gt;For more information see also
+the</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;address 
class="byline"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux 
FAQ&lt;/a&gt;,
 and &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;&lt;/p&gt;
-  <span class="removed"><del><strong>&lt;/blockquote&gt;</strong></del></span>
-&lt;/div&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;
+  &lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;
 Many computer users run a modified version of
 &lt;a href="/philosophy/categories.html#TheGNUsystem"&gt;the GNU 
system&lt;/a&gt;
 every day, without realizing it.  Through a peculiar turn of events,
 the version of GNU which is widely used today is often called
-&ldquo;Linux&rdquo;, and many of its users
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> and 
many of its users
 are &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt; not aware&lt;/a&gt;
 that it is basically the GNU system, developed by the
 &lt;a href="/gnu/gnu-history.html"&gt;GNU Project&lt;/a&gt;.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;div class="announcement comment" 
role="complementary"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;p&gt;For more information see also
+the &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;,
+and &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;</em></ins></span>
+
 &lt;p&gt;
 There really is a Linux, and these people are using it, but it is just
 a part of the system they use.  Linux is the kernel: the program in
@@ -63,7 +68,8 @@
 &lt;p&gt;
 Many users do not understand the difference between the kernel, which
 is Linux, and the whole system, which they also call
-&ldquo;Linux&rdquo;.  The ambiguous use of the name doesn't help
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  The 
ambiguous use of the name doesn't help
 people understand.  These users often think that Linus Torvalds
 developed the whole operating system in 1991, with a bit of help.&lt;/p&gt;
 
@@ -100,7 +106,8 @@
 &lt;p&gt;
 If we tried to measure the GNU Project's contribution in this way,
 what would we conclude?  One CD-ROM vendor found that in their &ldquo;Linux
-distribution&rdquo;, &lt;a 
href="/philosophy/categories.html#GNUsoftware"&gt;GNU
+<span class="removed"><del><strong>distribution&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>distribution,&rdquo;</em></ins></span> &lt;a 
href="/philosophy/categories.html#GNUsoftware"&gt;GNU
 software&lt;/a&gt; was the largest single contingent, around 28% of the
 total source code, and this included some of the essential major
 components without which there could be no system.  Linux itself was
@@ -108,7 +115,7 @@
 repository of gNewSense, Linux is 1.5% and GNU packages are 15%.)
 So if you were going to pick a name for the system based on
 who wrote the programs in the system, the most appropriate single
-choice would be &ldquo;GNU&rdquo;.&lt;/p&gt;
+choice would be <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU.&rdquo;&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
 But that is not the deepest way to consider the question.  The GNU
@@ -147,7 +154,7 @@
 Fortunately, we didn't have to wait for the Hurd, because of Linux.
 Once Torvalds freed Linux in 1992, it fit into the last major gap in
 the GNU system.  People could
-then &lt;a 
href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+then &lt;a <span 
class="removed"><del><strong>href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
 combine Linux with the GNU system&lt;/a&gt; to make a complete free system
 &mdash; a version of the GNU system which also contained Linux.  The
 GNU/Linux system, in other words.&lt;/p&gt;
@@ -165,7 +172,7 @@
 
 &lt;p&gt;
 The GNU Project supports GNU/Linux systems as well as &lt;em&gt;the&lt;/em&gt; 
GNU
-system.  The &lt;a href="http://fsf.org/"&gt;FSF&lt;/a&gt; funded the 
rewriting of
+system.  The &lt;a <span 
class="removed"><del><strong>href="http://fsf.org/"&gt;FSF&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://fsf.org/"&gt;FSF&lt;/a&gt;</em></ins></span>
 funded the rewriting of
 the Linux-related extensions to the GNU C library, so that now they
 are well integrated, and the newest GNU/Linux systems use the current
 library release with no changes.  The FSF also funded an early stage
@@ -189,7 +196,7 @@
 be loaded into I/O devices when the system starts, and they are
 included, as long series of numbers, in the "source code" of Linux.
 Thus, maintaining free GNU/Linux distributions now entails maintaining
-a &lt;a href="http://directory.fsf.org/project/linux"&gt; free version of
+a &lt;a <span 
class="removed"><del><strong>href="http://directory.fsf.org/project/linux"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://directory.fsf.org/project/linux"&gt;</em></ins></span>
 free version of
 Linux&lt;/a&gt; too.&lt;/p&gt;
 
 &lt;p&gt;Whether you use GNU/Linux or not, please don't confuse the public
@@ -197,14 +204,16 @@
 kernel, one of the essential major components of the system.  The
 system as a whole is basically the GNU system, with Linux added.  When
 you're talking about this combination, please call it
-&ldquo;GNU/Linux&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.&lt;/p&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
 If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
 reference, this page and &lt;a href="/gnu/the-gnu-project.html"&gt;
-http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt; are good choices.  If
+<span 
class="removed"><del><strong>http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>https://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</em></ins></span>
 are good choices.  If
 you mention Linux, the kernel, and want to add a link for further
-reference, &lt;a 
href="http://foldoc.org/linux"&gt;http://foldoc.org/linux&lt;/a&gt; 
+reference, &lt;a <span 
class="removed"><del><strong>href="http://foldoc.org/linux"&gt;http://foldoc.org/linux&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://foldoc.org/linux"&gt;https://foldoc.org/linux&lt;/a&gt;</em></ins></span>
 
 is a good URL to use.&lt;/p&gt;
 
 <span 
class="removed"><del><strong>&lt;h3&gt;Postscripts&lt;/h3&gt;</strong></del></span>
@@ -235,35 +244,44 @@
 <span 
class="removed"><del><strong>&lt;h3&gt;Notes:&lt;/h3&gt;</strong></del></span>
 <span class="inserted"><ins><em>&lt;div class="column-limit"&gt;&lt;/div&gt;
 
-&lt;h3 class="footnote"&gt;Notes&lt;/h3&gt;</em></ins></span>
+&lt;h3 class="footnote"&gt;Footnotes&lt;/h3&gt;</em></ins></span>
 &lt;ol&gt;
-&lt;li&gt;
-&lt;a id="unexciting"&gt;&lt;/a&gt;These unexciting but essential components
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="unexciting"&gt;&lt;/a&gt;These</strong></del></span>
+<span class="inserted"><ins><em>&lt;li 
id="unexciting"&gt;These</em></ins></span> unexciting but essential components
 include the GNU assembler (GAS) and the linker (GLD), both
 are now part of the &lt;a href="/software/binutils/"&gt;GNU Binutils&lt;/a&gt;
 package, &lt;a href="/software/tar/"&gt;GNU tar&lt;/a&gt;, and many 
more.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="nottools"&gt;&lt;/a&gt;For instance, The Bourne Again SHell (BASH),
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="nottools"&gt;&lt;/a&gt;For</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li id="nottools"&gt;For</em></ins></span> 
instance, The Bourne Again SHell (BASH),
 the PostScript interpreter
 &lt;a href="/software/ghostscript/ghostscript.html"&gt;Ghostscript&lt;/a&gt;, 
and the
 &lt;a href="/software/libc/libc.html"&gt;GNU C library&lt;/a&gt; are not
 programming tools.  Neither are GNUCash, GNOME, and GNU Chess.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="somecomponents"&gt;&lt;/a&gt;For instance, the
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="somecomponents"&gt;&lt;/a&gt;For</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li 
id="somecomponents"&gt;For</em></ins></span> instance, the
 &lt;a href="/software/libc/libc.html"&gt;GNU C library&lt;/a&gt;.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="newersystems"&gt;&lt;/a&gt;Since that was written, a nearly-all-free
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="newersystems"&gt;&lt;/a&gt;Since</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li 
id="newersystems"&gt;Since</em></ins></span> that was written, a nearly-all-free
 Windows-like system has been developed, but technically it is not at
 all like GNU or Unix, so it doesn't really affect this issue.  Most of
 the kernel of Solaris has been made free, but if you wanted to make a
 free system out of that, aside from replacing the missing parts of the
 kernel, you would also need to put it into GNU or BSD.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="gnubsd"&gt;&lt;/a&gt;On the other hand, in the years since this 
article
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="gnubsd"&gt;&lt;/a&gt;On</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li id="gnubsd"&gt;On</em></ins></span> the 
other hand, in the years since this article
 was written, the GNU C Library has been ported to several versions of
 the BSD kernel, which made it straightforward to combine the GNU system
 with that kernel.  Just as with GNU/Linux, these are indeed variants of
@@ -271,10 +289,8 @@
 GNU/kNetBSD depending on the kernel of the system.  Ordinary users on
 typical desktops can hardly distinguish between GNU/Linux and
 GNU/*BSD.&lt;/li&gt;
-
 &lt;/ol&gt;
-<span class="inserted"><ins><em>&lt;/div&gt;
-&lt;/div&gt;</em></ins></span>
+<span class="inserted"><ins><em>&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;
@@ -323,7 +339,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; <span class="removed"><del><strong>1997, 1998, 1999, 
2000, 2001, 2002,</strong></del></span> <span 
class="inserted"><ins><em>1997-2002,</em></ins></span> 2007, <span 
class="removed"><del><strong>2014, 2015, 2016, 2017</strong></del></span> <span 
class="inserted"><ins><em>2014-2017, 2019, 2021</em></ins></span> Richard M. 
Stallman&lt;/p&gt;
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>1997, 1998, 1999, 
2000, 2001, 2002,
+2007, 2014, 2015, 2016, 2017</strong></del></span> <span 
class="inserted"><ins><em>1997-2002, 2005, 2008, 2019, 2021</em></ins></span> 
Richard <span class="removed"><del><strong>M.</strong></del></span> 
Stallman&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
@@ -333,11 +350,12 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/06/08 08:44:38 $
+$Date: 2021/08/30 13:34:54 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-&lt;/div&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for class="inner", starts 
in the banner include --&gt;</em></ins></span>
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>

Index: gnu/po/linux-and-gnu.el.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.el.po,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- gnu/po/linux-and-gnu.el.po  27 May 2021 19:00:39 -0000      1.18
+++ gnu/po/linux-and-gnu.el.po  30 Aug 2021 13:34:54 -0000      1.19
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2015-05-09 09:11+0200\n"
 "Last-Translator: Georgios Zarkadas <gz@member.fsf.org>\n"
 "Language-Team: Greek <www-el-translators@gnu.org>\n"
@@ -46,32 +46,40 @@
 "GNU, έτσι ώστε οι χρήστες υπολογιστών να 
έχουν την ελευθερία να "
 "διαμοιράζονται και να βελτιώνουν το 
λογισμικό που χρησιμοποιούν."
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "Το Linux και το σύστημα GNU"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 # | by <a href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a>
 #, fuzzy
 #| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "από τον <a href=\"http://www.stallman.org/\";>Richard 
Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"Για περισσότερες πληροφορίες δείτε 
επίσης τις <a href=\"/gnu/gnu-linux-faq."
-"html\">Συχνές ερωτήσεις GNU/Linux</a>, καθώς και το 
<a href=\"/gnu/why-gnu-"
-"linux.html\">Γιατί GNU/Linux;</a>"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many computer users run a modified version of <a
+# | href=\"/philosophy/categories.html#TheGNUsystem\">the GNU system</a> every
+# | day, without realizing it.  Through a peculiar turn of events, the version
+# | of GNU which is widely used today is often called [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and many of its users are <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> that it is
+# | basically the GNU system, developed by the <a
+# | href=\"/gnu/gnu-history.html\">GNU Project</a>.
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -86,6 +94,15 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"Για περισσότερες πληροφορίες δείτε 
επίσης τις <a href=\"/gnu/gnu-linux-faq."
+"html\">Συχνές ερωτήσεις GNU/Linux</a>, καθώς και το 
<a href=\"/gnu/why-gnu-"
+"linux.html\">Γιατί GNU/Linux;</a>"
+
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -107,10 +124,22 @@
 "οι αποκαλούμενες διανομές &ldquo;Linux&rdquo; 
είναι στην πραγματικότητα "
 "διανομές GNU/Linux."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many users do not understand the difference between the kernel, which is
+# | Linux, and the whole system, which they also call [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} The ambiguous use of the name doesn't help people
+# | understand.  These users often think that Linus Torvalds developed the
+# | whole operating system in 1991, with a bit of help.
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -121,7 +150,7 @@
 "κατανόηση.  Αυτοί οι χρήστες συχνά 
πιστεύουν πως ο Linus Torvalds ανέπτυξε "
 "ολόκληρο το λειτουργικό σύστημα το 1991, με 
λίγη βοήθεια."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -141,7 +170,7 @@
 "ο,τιδήποτε ήταν απαραίτητο για να γίνει 
ένα παρόμοιο με το Unix σύστημα ήταν "
 "ήδη διαθέσιμο."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free software</"
@@ -163,7 +192,7 @@
 "Μέχρι τη στιγμή που το Linux άρχισε να δημιου
ργείται, το GNU είχε σχεδόν "
 "ολοκληρωθεί."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -181,18 +210,42 @@
 "συνεισφορά τέτοιου είδους έργων με τα συ
γκεκριμένα προγράμματα που "
 "προκύπτουν από το έργο."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If we tried to measure the GNU Project's contribution in this way, what
+# | would we conclude? One CD-ROM vendor found that in their &ldquo;Linux
+# | [-distribution&rdquo;,-] {+distribution,&rdquo;+} <a
+# | href=\"/philosophy/categories.html#GNUsoftware\">GNU software</a> was the
+# | largest single contingent, around 28% of the total source code, and this
+# | included some of the essential major components without which there could
+# | be no system.  Linux itself was about 3%.  (The proportions in 2008 are
+# | similar: in the &ldquo;main&rdquo; repository of gNewSense, Linux is 1.5%
+# | and GNU packages are 15%.)  So if you were going to pick a name for the
+# | system based on who wrote the programs in the system, the most appropriate
+# | single choice would be [-&ldquo;GNU&rdquo;.-] {+&ldquo;GNU.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "If we tried to measure the GNU Project's contribution in this way, what "
+#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
+#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
+#| "\">GNU software</a> was the largest single contingent, around 28% of the "
+#| "total source code, and this included some of the essential major "
+#| "components without which there could be no system.  Linux itself was "
+#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
+#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
+#| "15%.)  So if you were going to pick a name for the system based on who "
+#| "wrote the programs in the system, the most appropriate single choice "
+#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "Εάν προσπαθούσαμε να μετρήσουμε τη συ
νεισφορά του Έργου GNU κατά τον ίδιο "
 "τρόπο, που θα καταλήγαμε;  Ένας διανομέας 
CD-ROM διαπίστωσε ότι σε μία "
@@ -207,7 +260,7 @@
 "στο σύστημα, τότε η πιο κατάλληλη ατομική 
επιλογή θα ήταν το &ldquo;"
 "GNU&rdquo;."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -224,7 +277,7 @@
 "Έργο GNU έθεσε ως στόχο να αναπτύξει <em>ένα 
απόλυτα ελεύθερο, παρόμοιο με "
 "το Unix σύστημα</em>: το GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -254,7 +307,7 @@
 "href=\"#nottools\">(2)</a>.  Αναπτύξαμε ακόμη κι ένα 
παιχνίδι σκακιού, το "
 "GNU Chess, επειδή ένα πλήρες σύστημα 
χρειάζεται και παιχνίδια επίσης."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -270,11 +323,27 @@
 "hurd-and-linux.html\">το GNU Hurd άρχισε να λειτουργεί 
αξιόπιστα το 2001</"
 "a>, αλλά έχει ακόμη ένα μακρύ δρόμο μέχρι να 
γίνει έτοιμο για γενική χρήση."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once
+# | Torvalds freed Linux in 1992, it fit into the last major gap in the GNU
+# | system.  People could then <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | combine Linux with the GNU system</a> to make a complete free system
+# | &mdash; a version of the GNU system which also contained Linux.  The
+# | GNU/Linux system, in other words.
+#, fuzzy
+#| msgid ""
+#| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
+#| "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
+#| "system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+#| "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the "
+#| "GNU system</a> to make a complete free system &mdash; a version of the "
+#| "GNU system which also contained Linux.  The GNU/Linux system, in other "
+#| "words."
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -287,7 +356,7 @@
 "φτιάξουν ένα πλήρες ελεύθερο σύστημα&mdash; 
μια έκδοση του GNU συστήματος "
 "που περιείχε επίσης το Linux.  Το GNU/Linux 
σύστημα με άλλα λόγια. "
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -310,11 +379,25 @@
 "διανομές του συστήματος έκαναν πολλή ου
σιώδη εργασία.  Αλλά ήταν εργασία "
 "που, λόγω της φύσης των πραγμάτων, θα 
γινόταν σίγουρα από κάποιον."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU
+# | system.  The <a href=\"http{+s+}://fsf.org/\">FSF</a> funded the rewriting
+# | of the Linux-related extensions to the GNU C library, so that now they are
+# | well integrated, and the newest GNU/Linux systems use the current library
+# | release with no changes.  The FSF also funded an early stage of the
+# | development of Debian GNU/Linux.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -327,7 +410,7 @@
 "επίσης χρηματοδότησε ένα πρώιμο στάδιο 
της ανάπτυξης της διανομής Debian GNU/"
 "Linux."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Today there are many different variants of the GNU/Linux system (often
 # | called &ldquo;distros&rdquo;).  Most of them include nonfree
 # | [-software&mdash;their-] {+programs&mdash;their+} developers follow the
@@ -368,14 +451,31 @@
 "διανομές GNU/Linux</a>.  Το ΙΕΛ υποστηρίζει υ
πολογιστικές εγκαταστάσεις για "
 "τη διανομή <a href=\"http://gnewsense.org/\";>gNewSense</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Making a free GNU/Linux distribution is not just a matter of eliminating
+# | various nonfree programs.  Nowadays, the usual version of Linux contains
+# | nonfree programs too.  These programs are intended to be loaded into I/O
+# | devices when the system starts, and they are included, as long series of
+# | numbers, in the \"source code\" of Linux.  Thus, maintaining free
+# | GNU/Linux distributions now entails maintaining a <a
+# | href=\"http{+s+}://directory.fsf.org/project/linux\"> free version of
+# | Linux</a> too.
+#, fuzzy
+#| msgid ""
+#| "Making a free GNU/Linux distribution is not just a matter of eliminating "
+#| "various nonfree programs.  Nowadays, the usual version of Linux contains "
+#| "nonfree programs too.  These programs are intended to be loaded into I/O "
+#| "devices when the system starts, and they are included, as long series of "
+#| "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/"
+#| "Linux distributions now entails maintaining a <a href=\"http://directory.";
+#| "fsf.org/project/linux\"> free version of Linux</a> too."
 msgid ""
 "Making a free GNU/Linux distribution is not just a matter of eliminating "
 "various nonfree programs.  Nowadays, the usual version of Linux contains "
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 "Η δημιουργία μιας ελεύθερης διανομής 
GNU/Linux δεν είναι μόνο θέμα της "
@@ -387,13 +487,26 @@
 "συνεπάγεται τώρα τη συντήρηση μιας <a 
href=\"http://directory.fsf.org/";
 "project/linux\"> ελεύθερης έκδοσης του Linux</a> 
επίσης."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Whether you use GNU/Linux or not, please don't confuse the public by using
+# | the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the
+# | essential major components of the system.  The system as a whole is
+# | basically the GNU system, with Linux added.  When you're talking about
+# | this combination, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Είτε χρησιμοποιείτε το GNU/Linux, είτε όχι, σας 
παρακαλούμε να μην "
 "μπερδεύετε τον υπόλοιπο κόσμο 
χρησιμοποιώντας το όνομα &ldquo;Linux&rdquo; "
@@ -402,13 +515,29 @@
 "με το Linux προστιθέμενο.  Όταν μιλάτε γι' αυ
τόν το συνδυασμό, παρακαλούμε "
 "αποκαλείτε τον &ldquo;GNU/Linux&rdquo;."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
+# | reference, this page and <a href=\"/gnu/the-gnu-project.html\">
+# | http{+s+}://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
+# | you mention Linux, the kernel, and want to add a link for further
+# | reference, <a
+# | [-href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a>-]
+# | {+href=\"https://foldoc.org/linux\";>https://foldoc.org/linux</a>+} is a
+# | good URL to use.
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "Εάν θέλετε να κάνετε ένα σύνδεσμο στο 
&ldquo;GNU/Linux&rdquo;, για περαιτέρω "
 "αναφορά, αυτή η σελίδα καθώς και η <a 
href=\"/gnu/the-gnu-project.html\"> "
@@ -417,11 +546,11 @@
 "για περαιτέρω αναφορά, το <a 
href=\"http://foldoc.org/linux\";>http://foldoc.";
 "org/linux</a> είναι ένα καλό URL για να 
χρησιμοποιήσετε."
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr "Συμπλήρωμα"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Aside from GNU, one other project has independently produced a free Unix-"
 "like operating system.  This system is known as BSD, and it was developed at "
@@ -437,7 +566,7 @@
 "υπάρχει σήμερα<a href=\"#newersystems\">(4)</a> είναι 
σχεδόν με βεβαιότητα "
 "είτε μια παραλλαγή του συστήματος GNU, είτε 
ένα είδος του συστήματος BSD."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -461,32 +590,51 @@
 "σύστημα GNU, κι ένα όνομα όπως GNU/BSD δεν θα 
ταίριαζε στην περίπτωση.<a "
 "href=\"#gnubsd\">(5)</a>"
 
-#. type: Content of: <div><div><h3>
-# | Notes[-:-]
+# type: Content of: <h4>
+#. type: Content of: <div><h3>
+msgid "Footnotes"
+msgstr "Υποσημειώσεις"
+
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"unexciting\"></a>These-]{+These+} unexciting but essential
+# | components include the GNU assembler (GAS) and the linker (GLD), both are
+# | now part of the <a href=\"/software/binutils/\">GNU Binutils</a> package,
+# | <a href=\"/software/tar/\">GNU tar</a>, and many more.
 #, fuzzy
-#| msgid "Notes:"
-msgid "Notes"
-msgstr "Σημειώσεις:"
-
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+#| msgid ""
+#| "<a id=\"unexciting\"></a>These unexciting but essential components "
+#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
+#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
+#| "\"/software/tar/\">GNU tar</a>, and many more."
+msgid ""
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\"></a>Αυτά τα πληκτικά άλλα ου
σιώδη συστατικά "
 "περιλαμβάνουν το GNU συμβολομεταφραστή (GAS) 
και το συνδέτη (GLD), και τα "
 "δύο τώρα μέρη του πακέτου <a 
href=\"/software/binutils/\">GNU Binutils</a>, "
 "το <a href=\"/software/tar/\">GNU tar</a>, και πολλά άλλα."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"nottools\"></a>For-]{+For+} instance, The Bourne Again SHell
+# | (BASH), the PostScript interpreter <a
+# | href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the
+# | <a href=\"/software/libc/libc.html\">GNU C library</a> are not programming
+# | tools.  Neither are GNUCash, GNOME, and GNU Chess.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\"></a>Για παράδειγμα, το Bourne Again SHell 
(BASH), ο "
 "διερμηνέας PostScript <a 
href=\"/software/ghostscript/ghostscript.html"
@@ -494,22 +642,41 @@
 "GNU C</a> δεν αποτελούν προγραμματιστικά 
εργαλεία.  Το ίδιο ισχύει και για "
 "τα GNUCash, GNOME, και GNU Chess."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"somecomponents\"></a>For-]{+For+} instance, the <a
+# | href=\"/software/libc/libc.html\">GNU C library</a>.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\"></a>Για παράδειγμα, η <a 
href=\"/software/libc/libc."
 "html\">βιβλιοθήκη GNU C</a>."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"newersystems\"></a>Since-]{+Since+} that was written, a
+# | nearly-all-free Windows-like system has been developed, but technically it
+# | is not at all like GNU or Unix, so it doesn't really affect this issue. 
+# | Most of the kernel of Solaris has been made free, but if you wanted to
+# | make a free system out of that, aside from replacing the missing parts of
+# | the kernel, you would also need to put it into GNU or BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\"></a>Από τότε που γράφηκε αυτό, 
ένα σχεδόν-πλήρως-"
 "ελεύθερο παρόμοιο με Windows σύστημα έχει 
αναπτυχθεί, αλλά τεχνικά δεν είναι "
@@ -519,15 +686,31 @@
 "αντικαταστήσετε τα μέρη που λείπουν από 
τον πυρήνα, θα χρειαζόταν να τον "
 "βάλετε μέσα στο GNU ή το BSD."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"gnubsd\"></a>On-]{+On+} the other hand, in the years since this
+# | article was written, the GNU C Library has been ported to several versions
+# | of the BSD kernel, which made it straightforward to combine the GNU system
+# | with that kernel.  Just as with GNU/Linux, these are indeed variants of
+# | GNU, and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD
+# | depending on the kernel of the system.  Ordinary users on typical desktops
+# | can hardly distinguish between GNU/Linux and GNU/*BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
+#| "was written, the GNU C Library has been ported to several versions of the "
+#| "BSD kernel, which made it straightforward to combine the GNU system with "
+#| "that kernel.  Just as with GNU/Linux, these are indeed variants of GNU, "
+#| "and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD "
+#| "depending on the kernel of the system.  Ordinary users on typical "
+#| "desktops can hardly distinguish between GNU/Linux and GNU/*BSD."
+msgid ""
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a id=\"gnubsd\"></a>Από την άλλη, στα χρόνια μετά 
τη συγγραφή αυτού του "
 "άρθρου, η βιβλιοθήκη GNU C μεταφέρθηκε σε 
διάφορες εκδόσεις του πυρήνα BSD, "
@@ -590,15 +773,13 @@
 "\"/server/standards/README.translations.html\">Μεταφράσεις 
ΔΙΑΒΑΣΕΜΕ</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; [-1997, 1998, 1999, 2000, 2001, 2002,-] {+1997-2002,+}
-# | 2007, [-2014, 2015, 2016, 2017-] {+2014-2017, 2019, 2021+} Richard M.
-# | Stallman
+# | Copyright &copy; [-1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014, 2015,
+# | 2016, 2017-] {+1997-2002, 2005, 2008, 2019, 2021+} Richard [-M.-] Stallman
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014, 2015, "
 #| "2016, 2017 Richard M. Stallman"
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Πνευματικά δικαιώματα:<br />\n"
 "Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014, 2015, 2016, "
@@ -630,6 +811,11 @@
 msgid "Updated:"
 msgstr "Ενημερώθηκε:"
 
+#, fuzzy
+#~| msgid "Notes:"
+#~ msgid "Notes"
+#~ msgstr "Σημειώσεις:"
+
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"

Index: gnu/po/linux-and-gnu.es.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.es.po,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- gnu/po/linux-and-gnu.es.po  30 Apr 2021 09:12:02 -0000      1.77
+++ gnu/po/linux-and-gnu.es.po  30 Aug 2021 13:34:54 -0000      1.78
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-04-08 11:33+0200\n"
 "Last-Translator: Javier Fdez. Retenaga <jfrtnaga@gnu.org>\n"
 "Language-Team: Spanish <www-es-general@gnu.org>\n"
@@ -18,6 +18,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "X-Generator: Poedit 2.2.1\n"
 
 # type: Content of: <title>
@@ -46,32 +47,39 @@
 "compartir y mejorar el software que usan."
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "Linux y el sistema GNU"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "por <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-# type: Content of: <div><blockquote><p>
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"Para más información, consulte también las <a 
href=\"/gnu/gnu-linux-faq.html"
-"\">preguntas frequentes sobre GNU/Linux</a> y el artículo <a 
href=\"/gnu/why-"
-"gnu-linux.html\">¿Por qué GNU/Linux?</a>"
-
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many computer users run a modified version of <a
+# | href=\"/philosophy/categories.html#TheGNUsystem\">the GNU system</a> every
+# | day, without realizing it.  Through a peculiar turn of events, the version
+# | of GNU which is widely used today is often called [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and many of its users are <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> that it is
+# | basically the GNU system, developed by the <a
+# | href=\"/gnu/gnu-history.html\">GNU Project</a>.
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -84,9 +92,19 @@
 "dan cuenta</a> de que básicamente se trata del sistema GNU, desarrollado por 
"
 "el <a href=\"/gnu/gnu-history.html\">proyecto GNU</a>."
 
-# type: Content of: <p>
+# type: Content of: <div><blockquote><p>
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"Para más información, consulte también las <a 
href=\"/gnu/gnu-linux-faq.html"
+"\">preguntas frequentes sobre GNU/Linux</a> y el artículo <a 
href=\"/gnu/why-"
+"gnu-linux.html\">¿Por qué GNU/Linux?</a>"
+
+# type: Content of: <p>
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -108,10 +126,22 @@
 "distribuciones denominadas «Linux» son en realidad distribuciones 
GNU/Linux."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many users do not understand the difference between the kernel, which is
+# | Linux, and the whole system, which they also call [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} The ambiguous use of the name doesn't help people
+# | understand.  These users often think that Linus Torvalds developed the
+# | whole operating system in 1991, with a bit of help.
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -123,7 +153,7 @@
 "completo en 1991."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -143,7 +173,7 @@
 "disponible."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free software</"
@@ -165,7 +195,7 @@
 "inició a desarrollar Linux, GNU ya estaba casi terminado."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -183,18 +213,42 @@
 "específicos que aportan."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If we tried to measure the GNU Project's contribution in this way, what
+# | would we conclude? One CD-ROM vendor found that in their &ldquo;Linux
+# | [-distribution&rdquo;,-] {+distribution,&rdquo;+} <a
+# | href=\"/philosophy/categories.html#GNUsoftware\">GNU software</a> was the
+# | largest single contingent, around 28% of the total source code, and this
+# | included some of the essential major components without which there could
+# | be no system.  Linux itself was about 3%.  (The proportions in 2008 are
+# | similar: in the &ldquo;main&rdquo; repository of gNewSense, Linux is 1.5%
+# | and GNU packages are 15%.)  So if you were going to pick a name for the
+# | system based on who wrote the programs in the system, the most appropriate
+# | single choice would be [-&ldquo;GNU&rdquo;.-] {+&ldquo;GNU.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "If we tried to measure the GNU Project's contribution in this way, what "
+#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
+#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
+#| "\">GNU software</a> was the largest single contingent, around 28% of the "
+#| "total source code, and this included some of the essential major "
+#| "components without which there could be no system.  Linux itself was "
+#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
+#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
+#| "15%.)  So if you were going to pick a name for the system based on who "
+#| "wrote the programs in the system, the most appropriate single choice "
+#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "Si tratáramos de medir la contribución del Proyecto GNU de esta manera, ¿a 
"
 "qué conclusión llegaríamos? Un vendedor de CD-ROM constató que en su "
@@ -209,7 +263,7 @@
 "la opción más adecuada sería «GNU»."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -227,7 +281,7 @@
 "em>: GNU."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -258,7 +312,7 @@
 "completo también necesita juegos."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -276,11 +330,27 @@
 "por el público en general."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once
+# | Torvalds freed Linux in 1992, it fit into the last major gap in the GNU
+# | system.  People could then <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | combine Linux with the GNU system</a> to make a complete free system
+# | &mdash; a version of the GNU system which also contained Linux.  The
+# | GNU/Linux system, in other words.
+#, fuzzy
+#| msgid ""
+#| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
+#| "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
+#| "system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+#| "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the "
+#| "GNU system</a> to make a complete free system &mdash; a version of the "
+#| "GNU system which also contained Linux.  The GNU/Linux system, in other "
+#| "words."
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -294,7 +364,7 @@
 "Linux; es decir, el sistema GNU/Linux."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -318,11 +388,25 @@
 "alguien habría hecho tarde o temprano."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU
+# | system.  The <a href=\"http{+s+}://fsf.org/\">FSF</a> funded the rewriting
+# | of the Linux-related extensions to the GNU C library, so that now they are
+# | well integrated, and the newest GNU/Linux systems use the current library
+# | release with no changes.  The FSF also funded an early stage of the
+# | development of Debian GNU/Linux.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -335,7 +419,7 @@
 "también financió las etapas iniciales del desarrollo de Debian GNU/Linux."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Today there are many different variants of the GNU/Linux system (often "
 "called &ldquo;distros&rdquo;).  Most of them include nonfree programs&mdash;"
@@ -357,14 +441,31 @@
 "algunas de ellas."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Making a free GNU/Linux distribution is not just a matter of eliminating
+# | various nonfree programs.  Nowadays, the usual version of Linux contains
+# | nonfree programs too.  These programs are intended to be loaded into I/O
+# | devices when the system starts, and they are included, as long series of
+# | numbers, in the \"source code\" of Linux.  Thus, maintaining free
+# | GNU/Linux distributions now entails maintaining a <a
+# | href=\"http{+s+}://directory.fsf.org/project/linux\"> free version of
+# | Linux</a> too.
+#, fuzzy
+#| msgid ""
+#| "Making a free GNU/Linux distribution is not just a matter of eliminating "
+#| "various nonfree programs.  Nowadays, the usual version of Linux contains "
+#| "nonfree programs too.  These programs are intended to be loaded into I/O "
+#| "devices when the system starts, and they are included, as long series of "
+#| "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/"
+#| "Linux distributions now entails maintaining a <a href=\"http://directory.";
+#| "fsf.org/project/linux\"> free version of Linux</a> too."
 msgid ""
 "Making a free GNU/Linux distribution is not just a matter of eliminating "
 "various nonfree programs.  Nowadays, the usual version of Linux contains "
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 "Hacer una distribución GNU/Linux libre no consiste solamente en eliminar los 
"
@@ -377,13 +478,26 @@
 "directory.fsf.org/project/linux\">versión libre de Linux</a>."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Whether you use GNU/Linux or not, please don't confuse the public by using
+# | the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the
+# | essential major components of the system.  The system as a whole is
+# | basically the GNU system, with Linux added.  When you're talking about
+# | this combination, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 " Ya sea que usted use GNU/Linux o no, por favor no siembre confusión "
 "empleando la denominación «Linux» de manera ambigua. Linux es el núcledo, 
"
@@ -392,13 +506,29 @@
 "se refiera a esta combinación, por favor emplee la expresión «GNU/Linux»."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
+# | reference, this page and <a href=\"/gnu/the-gnu-project.html\">
+# | http{+s+}://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
+# | you mention Linux, the kernel, and want to add a link for further
+# | reference, <a
+# | [-href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a>-]
+# | {+href=\"https://foldoc.org/linux\";>https://foldoc.org/linux</a>+} is a
+# | good URL to use.
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "Si desea proporcionar enlaces como referencia para la cuestión del nombre "
 "«GNU/Linux», esta misma página y <a href=\"/gnu/the-gnu-project.html"
@@ -407,12 +537,12 @@
 "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> es una "
 "página adecuada."
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr "Post scríptum"
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Aside from GNU, one other project has independently produced a free Unix-"
 "like operating system.  This system is known as BSD, and it was developed at "
@@ -430,7 +560,7 @@
 "sistema BSD."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -453,18 +583,28 @@
 "núcleo y lo añadieron al sistema GNU, por lo que un nombre como GNU/BSD no "
 "se ajustaría en esta situación. <a href=\"#gnubsd\">(5)</a>"
 
-# type: Content of: <h3>
-#. type: Content of: <div><div><h3>
-msgid "Notes"
+# type: Content of: <h4>
+#. type: Content of: <div><h3>
+msgid "Footnotes"
 msgstr "Notas"
 
 # type: Content of: <ol><li>
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"unexciting\"></a>These-]{+These+} unexciting but essential
+# | components include the GNU assembler (GAS) and the linker (GLD), both are
+# | now part of the <a href=\"/software/binutils/\">GNU Binutils</a> package,
+# | <a href=\"/software/tar/\">GNU tar</a>, and many more.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"unexciting\"></a>These unexciting but essential components "
+#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
+#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
+#| "\"/software/tar/\">GNU tar</a>, and many more."
+msgid ""
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\"></a>Estos componentes aburridos pero esenciales "
 "incluyen el ensamblador de GNU (GAS) y el enlazador (GLD), que ahora son "
@@ -472,13 +612,24 @@
 "href =\"/software/tar/\">tar de GNU</a> y muchos más."
 
 # type: Content of: <ol><li>
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"nottools\"></a>For-]{+For+} instance, The Bourne Again SHell
+# | (BASH), the PostScript interpreter <a
+# | href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the
+# | <a href=\"/software/libc/libc.html\">GNU C library</a> are not programming
+# | tools.  Neither are GNUCash, GNOME, and GNU Chess.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\"></a>Por ejemplo, la Bourne Again SHell (BASH), el "
 "intérprete PostScript <a href=\"/software/ghostscript/ghostscript.html\" "
@@ -487,23 +638,42 @@
 "ni GNU Chess."
 
 # type: Content of: <ol><li>
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"somecomponents\"></a>For-]{+For+} instance, the <a
+# | href=\"/software/libc/libc.html\">GNU C library</a>.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\"></a>Por ejemplo, la <a href=\"/software/libc/libc."
 "html\">biblioteca C de GNU</a>."
 
 # type: Content of: <ol><li>
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"newersystems\"></a>Since-]{+Since+} that was written, a
+# | nearly-all-free Windows-like system has been developed, but technically it
+# | is not at all like GNU or Unix, so it doesn't really affect this issue. 
+# | Most of the kernel of Solaris has been made free, but if you wanted to
+# | make a free system out of that, aside from replacing the missing parts of
+# | the kernel, you would also need to put it into GNU or BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\"></a>Después de haber escrito eso, se desarrolló un "
 "sistema de tipo Windows casi libre, pero técnicamente no es en absoluto como 
"
@@ -513,15 +683,31 @@
 "también habría que integrarlo a GNU o BSD."
 
 # type: Content of: <ol><li>
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"gnubsd\"></a>On-]{+On+} the other hand, in the years since this
+# | article was written, the GNU C Library has been ported to several versions
+# | of the BSD kernel, which made it straightforward to combine the GNU system
+# | with that kernel.  Just as with GNU/Linux, these are indeed variants of
+# | GNU, and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD
+# | depending on the kernel of the system.  Ordinary users on typical desktops
+# | can hardly distinguish between GNU/Linux and GNU/*BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
+#| "was written, the GNU C Library has been ported to several versions of the "
+#| "BSD kernel, which made it straightforward to combine the GNU system with "
+#| "that kernel.  Just as with GNU/Linux, these are indeed variants of GNU, "
+#| "and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD "
+#| "depending on the kernel of the system.  Ordinary users on typical "
+#| "desktops can hardly distinguish between GNU/Linux and GNU/*BSD."
+msgid ""
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a id=\"gnubsd\"></a>Por otra parte, en los años transcurridos desde que se "
 "escribió este artículo, la biblioteca C de GNU ha sido portada a varias "
@@ -578,8 +764,13 @@
 "coordinación y el envío de traducciones de las páginas de este sitio web."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+# | Copyright &copy; 1997-2002, [-2007, 2014-2017,-] {+2005, 2008,+} 2019,
+# | 2021 Richard [-M.-] Stallman
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. "
+#| "Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
 
@@ -604,3 +795,7 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Última actualización:"
+
+# type: Content of: <h3>
+#~ msgid "Notes"
+#~ msgstr "Notas"

Index: gnu/po/linux-and-gnu.fa.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.fa.po,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- gnu/po/linux-and-gnu.fa.po  7 Apr 2021 18:04:00 -0000       1.44
+++ gnu/po/linux-and-gnu.fa.po  30 Aug 2021 13:34:54 -0000      1.45
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2009-07-19 22:39+0300\n"
 "Last-Translator: Abbas Esmaeeli Some'eh <abbas@gnu.org>\n"
 "Language-Team: Persian <www-fa-general@list.gnu.org>\n"
@@ -39,32 +39,32 @@
 "کاربران کامپیوتر آزادی به اشتراک گذاری و 
بهبود نرم‌افزارهایی را که استفاده "
 "می‌کنند خواهند داشت."
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "لینوکس و سیستم گنو"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 #, fuzzy
 #| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "نوشتهٔ <a href=\"http://www.stallman.org/\";>ریچارد 
استالمن</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"برای اطلاعات بیشتر همچنین می‌توانید <a 
href=\"/gnu/gnu-linux-faq.html"
-"\">سوالات رایج گنو/لینوکس</a>، و <a 
href=\"/gnu/why-gnu-linux.html\">چرا گنو/"
-"لینوکس؟</a> را ببینید."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -79,6 +79,15 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"برای اطلاعات بیشتر همچنین می‌توانید <a 
href=\"/gnu/gnu-linux-faq.html"
+"\">سوالات رایج گنو/لینوکس</a>، و <a 
href=\"/gnu/why-gnu-linux.html\">چرا گنو/"
+"لینوکس؟</a> را ببینید."
+
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -98,10 +107,17 @@
 "هسته عمل می‌کند، به طور خلاصه گنو/لینوکس. 
تمام آنچه توزیع‌های «لینوکس» نامیده "
 "می‌شوند در حقیقت توزیع‌های گنو/لینوکس 
هستند."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -111,7 +127,7 @@
 "را افزایش نمی‌دهد. این کاربران گاهی اوقات 
حتی فکر می‌کنند که لینوس توروالدز در "
 "سال ۱۹۹۱ با کمی کمک تمام سیستم‌عامل را 
توسعه داد."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -128,7 +144,7 @@
 "دنبال نرم‌افزارهایی بودند که با آن کار 
کنند، و بیشتر موارد لازم برای ساختن یک "
 "سیستم شبه یونیکس را که از قبل فراهم بود 
پیدا کردند (بدون هیچ دلیلی)."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free software</"
@@ -148,7 +164,7 @@
 "گنو را برنامه‌ریزی کرده بود. هنگامیکه 
لینوکس نوشته شد سیستم گنو تقریبا تکمیل "
 "شده بود."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -164,18 +180,31 @@
 "بخواهیم میزان کمک و همکاری این پروژه‌ها 
را در برنامه‌هایی که از این پروژه‌ها "
 "بوجود آمده‌اند اندازه بگیریم."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "If we tried to measure the GNU Project's contribution in this way, what "
+#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
+#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
+#| "\">GNU software</a> was the largest single contingent, around 28% of the "
+#| "total source code, and this included some of the essential major "
+#| "components without which there could be no system.  Linux itself was "
+#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
+#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
+#| "15%.)  So if you were going to pick a name for the system based on who "
+#| "wrote the programs in the system, the most appropriate single choice "
+#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "اگر بخواهیم میزان همکاری پروژه‌های گنو را 
به این طریق محاسبه کنیم، چه نتیجه‌ای "
 "ممکن است بگیریم؟ یکی از فروشندگان سی‌دی م
توجه شد که در «توزیع لینوکس» آنها <a "
@@ -188,7 +217,7 @@
 "بنابراین اگر می‌خواهید برای سیستم بر اساس 
اسم کسانی که برای سیستم برنامه "
 "نوشته‌اند نامی انتخاب کنید، تنها انتخاب م
ناسب «گنو» می‌باشد."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -204,7 +233,7 @@
 "گنو در نظر دارد تا یک <em>سیستم کامل و آزاد 
شبه یونیکس</em> (گنو) را توسعه "
 "دهد."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -231,7 +260,7 @@
 "نوشتیم <a href=\"#nottools\">(۲)</a>. ما حتی یک بازی 
شطرنج به نام GNU Chess "
 "را نیز توسعه دادیم، زیرا یک سیستم کامل به 
بازی‌های خوب نیز احتیاج دارد."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -247,7 +276,7 @@
 "اعتماد شروع به کار کرد</a>، اما هنوز راه 
زیادی در پیش است تا آن را برای "
 "استفادهٔ عموم مردم آماده کنیم."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
@@ -259,7 +288,7 @@
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -271,7 +300,7 @@
 "ایجاد کنند: یک نسخه مبتنی بر لینوکس از 
سیستم گنو یا به اختصار یک سیستم گنو/"
 "لینوکس."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -292,11 +321,19 @@
 "توسعه دادند کمک قابل توجهی کردند. اما م
طابق طبیعت کارها، این کاری بود که "
 "باید توسط شخصی انجام می‌گرفت."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -308,7 +345,7 @@
 "جاری کتابخانه استفاده می‌کنند. همچنین 
بنیاد نرم‌افزارهای آزاد بر روی مراحل "
 "اولیهٔ توسعهٔ توزیع گنو/لینوکس دبیان نیز 
سرمایه‌گذاری کرده است."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "Today there are many different variants of the GNU/Linux system (often "
@@ -333,7 +370,7 @@
 "\">توزیع‌های کاملا آزاد</a> نیز وجود دارد. 
بنیاد نرم‌افزارهای آزاد <a href="
 "\"http://gnewsense.org/\";>gNewSense</a> را حمایت می‌کند."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "Making a free GNU/Linux distribution is not just a matter of eliminating "
@@ -349,7 +386,7 @@
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 "ساخت یک توزیع گنو/لینوکسِ آزاد تنها با حذف 
نرم‌افزارهای غیرآزاد مختلف میسر "
@@ -359,26 +396,41 @@
 "داشتن یک توزیع آزاد از گنو/لینوکس مستلزم 
داشتن <a href=\"http://directory.";
 "fsf.org/project/linux\">نسخه‌ای آزاد از لینوکس</a> نیز 
است."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "چه از گنو/لینوکس استفاده می‌کنید و چه نم
ی‌کنید، لطفا با استفاده دوپهلو از نام "
 "«لینوکس» عموم مردم را گیج نکنید. لینوکس 
هسته است، یکی از اجزاء اصلی و ضروری "
 "سیستم. کل سیستم یک سیستم گنو می‌باشد که 
لینوکس به آن اضافه شده است. هنگامیکه "
 "در مورد این ترکیب صحبت می‌کنید لطفاً آنرا 
«گنو/لینوکس» بخوانید."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "اگر می‌خواهید بر روی «گنو/لینوکس» لینکی 
به عنوان مرجع بگذارید، این صفحه و نیز "
 "<a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/the-gnu-";
@@ -386,11 +438,11 @@
 "اشاره کردید و خواستید لینکی به عنوان مرجع 
به آن اضافه کنید <a href=\"http://";
 "foldoc.org/linux\">http://foldoc.org/linux</a> یک آدرس خوب برای 
استفاده است."
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr "ضمیمه"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "Aside from GNU, one other project has independently produced a free Unix-"
@@ -412,7 +464,7 @@
 "سیستم در دهه ۸۰ آزاد نبود اما در اوایل دهه 
۹۰ آزاد شد. امروزه سیستم‌عامل‌های "
 "آزادِ موجود اغلب یا یک نوع سیستم گنو م
ی‌باشند و یا یک نوع سیستم BSD."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -434,13 +486,11 @@
 "ننوشته‌اند و آنرا به سیستم گنو اضافه 
نکرده‌اند، بنابراین نامی مانند GNU/BSD "
 "برای این وضعیت متناسب نیست.<a href=\"#gnubsd\">(۵)</a>"
 
-#. type: Content of: <div><div><h3>
-#, fuzzy
-#| msgid "Notes:"
-msgid "Notes"
-msgstr "یادداشت‌ها"
+#. type: Content of: <div><h3>
+msgid "Footnotes"
+msgstr ""
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
 #, fuzzy
 #| msgid ""
 #| "<a id=\"unexciting\"></a>These unexciting but essential components "
@@ -448,45 +498,62 @@
 #| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
 #| "\"/software/tar/\">GNU tar</a>, and more."
 msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\"></a>این اجزای غیر جذاب اما ضروری 
شامل GNU assembler "
 "(GAS) و لینکر (GLD)، که هردو هم اکنون جزئی از 
بستهٔ <a href=\"/software/"
 "binutils/\">GNU Binutils</a> هستند، <a href=\"/software/tar/\">GNU 
tar</a>، "
 "و بسیاری می‌شود."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\"></a>برای نمونه، Bourne Again SHell (همان 
BASH)، مفسر پست "
 "اسکریپتِ <a 
href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>، "
 "و <a href=\"/software/libc/libc.html\">GNU C library</a> ابزارهای "
 "برنامه‌نویسی نیستند. GNUCash، GNOME، و GNU Chess نیز 
همینطور."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\"></a>به عنوان مثال <a 
href=\"/software/libc/libc.html"
 "\">GNU C library</a>."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\"></a>هنگامی که این بخش نوشته شد، 
یک سیستم تقریبا آزاد "
 "مشابه ویندوز توسعه داده شده بود، اما از 
نظر فنی به هیچ عنوان مشابه گنو یا "
@@ -494,7 +561,7 @@
 "شده است، اما اگر بخواهید سیستمی آزاد از آن 
بسازید، گذشته از جایگزینیِ بخش‌های "
 "غیرآزاد هسته، بازهم مجبورید آن را درون گنو 
یا BSD قرار دهید."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
 #, fuzzy
 #| msgid ""
 #| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
@@ -505,13 +572,13 @@
 #| "system.  Ordinary users on typical desktops can hardly distinguish "
 #| "between GNU/Linux and GNU/*BSD."
 msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a id=\"gnubsd\"></a>از طرف دیگر، در سال‌هایی که 
این مقاله نگاشته شد، GNU C "
 "Library برای هستهٔ BSD نیز ویرایش شد، و این ام
کان را به وجود آورد که سیستم "
@@ -567,8 +634,7 @@
 
 #. type: Content of: <div><p>
 #, fuzzy
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007 Richard M. Stallman"
 
@@ -592,6 +658,11 @@
 msgid "Updated:"
 msgstr "آخرین به روز رسانی:"
 
+#, fuzzy
+#~| msgid "Notes:"
+#~ msgid "Notes"
+#~ msgstr "یادداشت‌ها"
+
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"

Index: gnu/po/linux-and-gnu.fr.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.fr.po,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- gnu/po/linux-and-gnu.fr.po  4 Jul 2021 18:22:45 -0000       1.90
+++ gnu/po/linux-and-gnu.fr.po  30 Aug 2021 13:34:54 -0000      1.91
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+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"
@@ -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-08-30 13:26+0000\n"
 "Plural-Forms:  \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -42,29 +43,37 @@
 "Unix, pour que les utilisateurs d'ordinateurs puissent avoir la liberté de "
 "partager et d'améliorer les logiciels qu'ils utilisent."
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "Linux et le système GNU"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "par <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"Pour plus de détails, consultez aussi la <a href=\"/gnu/gnu-linux-faq.html"
-"\">FAQ GNU/Linux</a> et <a href=\"/gnu/why-gnu-linux.html\">Pourquoi GNU/"
-"Linux ?</a>"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many computer users run a modified version of <a
+# | href=\"/philosophy/categories.html#TheGNUsystem\">the GNU system</a> every
+# | day, without realizing it.  Through a peculiar turn of events, the version
+# | of GNU which is widely used today is often called [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and many of its users are <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> that it is
+# | basically the GNU system, developed by the <a
+# | href=\"/gnu/gnu-history.html\">GNU Project</a>.
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -80,6 +89,15 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"Pour plus de détails, consultez aussi la <a href=\"/gnu/gnu-linux-faq.html"
+"\">FAQ GNU/Linux</a> et <a href=\"/gnu/why-gnu-linux.html\">Pourquoi GNU/"
+"Linux ?</a>"
+
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -101,10 +119,22 @@
 "Toutes les distributions appelées « Linux » sont en réalité des "
 "distributions de GNU/Linux."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many users do not understand the difference between the kernel, which is
+# | Linux, and the whole system, which they also call [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} The ambiguous use of the name doesn't help people
+# | understand.  These users often think that Linus Torvalds developed the
+# | whole operating system in 1991, with a bit of help.
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -115,7 +145,7 @@
 "Linus Torvalds a développé tout le système d'exploitation en 1991, avec un 
"
 "peu d'aide."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -134,7 +164,7 @@
 "particulière) presque tout ce qui était nécessaire à un système de type 
Unix "
 "était déjà disponible."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free software</"
@@ -155,7 +185,7 @@
 "pour le système GNU. Au moment où Linux a été lancé, GNU était presque "
 "terminé."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -172,18 +202,42 @@
 "System). Il est naturel de mesurer la contribution de ce type de projet par "
 "les programmes spécifiques qui proviennent du dit projet."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If we tried to measure the GNU Project's contribution in this way, what
+# | would we conclude? One CD-ROM vendor found that in their &ldquo;Linux
+# | [-distribution&rdquo;,-] {+distribution,&rdquo;+} <a
+# | href=\"/philosophy/categories.html#GNUsoftware\">GNU software</a> was the
+# | largest single contingent, around 28% of the total source code, and this
+# | included some of the essential major components without which there could
+# | be no system.  Linux itself was about 3%.  (The proportions in 2008 are
+# | similar: in the &ldquo;main&rdquo; repository of gNewSense, Linux is 1.5%
+# | and GNU packages are 15%.)  So if you were going to pick a name for the
+# | system based on who wrote the programs in the system, the most appropriate
+# | single choice would be [-&ldquo;GNU&rdquo;.-] {+&ldquo;GNU.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "If we tried to measure the GNU Project's contribution in this way, what "
+#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
+#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
+#| "\">GNU software</a> was the largest single contingent, around 28% of the "
+#| "total source code, and this included some of the essential major "
+#| "components without which there could be no system.  Linux itself was "
+#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
+#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
+#| "15%.)  So if you were going to pick a name for the system based on who "
+#| "wrote the programs in the system, the most appropriate single choice "
+#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "Si nous essayions de mesurer la contribution du projet GNU de cette manière, 
"
 "à quelle conclusion arriverions-nous ? Un distributeur de CD-ROM a 
constaté "
@@ -197,7 +251,7 @@
 "le système en se basant sur qui avait écrit les programmes qui le 
composent, "
 "le choix le plus approprié pour un nom unique serait « GNU »."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -214,7 +268,7 @@
 "bien que nous en ayons développé un. Dès le départ, le projet GNU a eu 
pour "
 "but de développer <em>un système de type Unix, complet et libre</em> : 
GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -245,7 +299,7 @@
 "même développé un jeu d'échec, GNU Chess, car un système complet a aussi 
"
 "besoin de jeux."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -262,11 +316,27 @@
 "manière fiable en 2001</a>, mais est encore loin d'être prêt pour un usage 
"
 "grand public."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once
+# | Torvalds freed Linux in 1992, it fit into the last major gap in the GNU
+# | system.  People could then <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | combine Linux with the GNU system</a> to make a complete free system
+# | &mdash; a version of the GNU system which also contained Linux.  The
+# | GNU/Linux system, in other words.
+#, fuzzy
+#| msgid ""
+#| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
+#| "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
+#| "system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+#| "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the "
+#| "GNU system</a> to make a complete free system &mdash; a version of the "
+#| "GNU system which also contained Linux.  The GNU/Linux system, in other "
+#| "words."
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -278,7 +348,7 @@
 "GNU</a> pour obtenir un système libre complet : une version du système GNU 
"
 "qui contenait aussi Linux, autrement dit le système GNU/Linux."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -301,11 +371,25 @@
 "effectué un travail essentiel. Mais c'était du travail qui, de toute 
façon, "
 "allait certainement être réalisé par quelqu'un."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU
+# | system.  The <a href=\"http{+s+}://fsf.org/\">FSF</a> funded the rewriting
+# | of the Linux-related extensions to the GNU C library, so that now they are
+# | well integrated, and the newest GNU/Linux systems use the current library
+# | release with no changes.  The FSF also funded an early stage of the
+# | development of Debian GNU/Linux.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -317,7 +401,7 @@
 "emploient la bibliothèque actuelle sans aucune modification. La FSF a aussi "
 "financé le développement de Debian GNU/Linux à ses débuts."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Today there are many different variants of the GNU/Linux system (often "
 "called &ldquo;distros&rdquo;).  Most of them include nonfree programs&mdash;"
@@ -338,14 +422,31 @@
 "entièrement libres</a>. La FSF fournit un support informatique à quelques-"
 "unes d'entre elles."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Making a free GNU/Linux distribution is not just a matter of eliminating
+# | various nonfree programs.  Nowadays, the usual version of Linux contains
+# | nonfree programs too.  These programs are intended to be loaded into I/O
+# | devices when the system starts, and they are included, as long series of
+# | numbers, in the \"source code\" of Linux.  Thus, maintaining free
+# | GNU/Linux distributions now entails maintaining a <a
+# | href=\"http{+s+}://directory.fsf.org/project/linux\"> free version of
+# | Linux</a> too.
+#, fuzzy
+#| msgid ""
+#| "Making a free GNU/Linux distribution is not just a matter of eliminating "
+#| "various nonfree programs.  Nowadays, the usual version of Linux contains "
+#| "nonfree programs too.  These programs are intended to be loaded into I/O "
+#| "devices when the system starts, and they are included, as long series of "
+#| "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/"
+#| "Linux distributions now entails maintaining a <a href=\"http://directory.";
+#| "fsf.org/project/linux\"> free version of Linux</a> too."
 msgid ""
 "Making a free GNU/Linux distribution is not just a matter of eliminating "
 "various nonfree programs.  Nowadays, the usual version of Linux contains "
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 "Pour faire une distribution libre de GNU/Linux, il ne suffit pas d'éliminer "
@@ -357,13 +458,26 @@
 "libres de GNU/Linux comporte maintenant celle d'une <a href=\"http://";
 "directory.fsf.org/project/linux\">version libre de Linux</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Whether you use GNU/Linux or not, please don't confuse the public by using
+# | the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the
+# | essential major components of the system.  The system as a whole is
+# | basically the GNU system, with Linux added.  When you're talking about
+# | this combination, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Que vous utilisiez GNU/Linux ou non, veuillez ne pas semer la confusion en "
 "utilisant le nom « Linux » de manière ambiguë. Linux est le noyau, un 
des "
@@ -371,13 +485,29 @@
 "fondamentalement le système GNU auquel on a ajouté Linux. Quand vous parlez 
"
 "de cette combinaison, veuillez l'appeler « GNU/Linux »."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
+# | reference, this page and <a href=\"/gnu/the-gnu-project.html\">
+# | http{+s+}://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
+# | you mention Linux, the kernel, and want to add a link for further
+# | reference, <a
+# | [-href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a>-]
+# | {+href=\"https://foldoc.org/linux\";>https://foldoc.org/linux</a>+} is a
+# | good URL to use.
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "Si vous voulez indiquer une référence vers « GNU/Linux », cette page et 
<a "
 "href=\"/gnu/the-gnu-project.html\">http://www.gnu.org/gnu/the-gnu-project.";
@@ -385,11 +515,11 @@
 "le noyau, <a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> "
 "est une bonne URL."
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr "Addendum"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Aside from GNU, one other project has independently produced a free Unix-"
 "like operating system.  This system is known as BSD, and it was developed at "
@@ -406,7 +536,7 @@
 "\"><sup>4</sup></a> est fort probablement soit une variante de GNU, soit un "
 "système de type BSD."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -429,29 +559,53 @@
 "écrit un noyau qu'ils auraient ajouté au système GNU, et un nom tel que 
GNU/"
 "BSD ne refléterait pas la situation.<a href=\"#gnubsd\"><sup>5</sup></a>"
 
-#. type: Content of: <div><div><h3>
-msgid "Notes"
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Footnotes"
+msgid "Footnotes"
 msgstr "Notes"
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"unexciting\"></a>These-]{+These+} unexciting but essential
+# | components include the GNU assembler (GAS) and the linker (GLD), both are
+# | now part of the <a href=\"/software/binutils/\">GNU Binutils</a> package,
+# | <a href=\"/software/tar/\">GNU tar</a>, and many more.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"unexciting\"></a>These unexciting but essential components "
+#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
+#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
+#| "\"/software/tar/\">GNU tar</a>, and many more."
+msgid ""
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\">Ces composants non passionnants mais essentiels</a> "
 "comprennent l'assembleur GNU (GAS) et le <i>linker</i> (GLD) qui font "
 "actuellement partie du paquet <a href=\"/software/binutils/\">GNU Binutils</"
 "a>, <a href=\"/software/tar/\">GNU tar</a>, etc."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"nottools\"></a>For-]{+For+} instance, The Bourne Again SHell
+# | (BASH), the PostScript interpreter <a
+# | href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the
+# | <a href=\"/software/libc/libc.html\">GNU C library</a> are not programming
+# | tools.  Neither are GNUCash, GNOME, and GNU Chess.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\">Par exemple</a>, le Bourne Again SHell (BASH), "
 "l'interpréteur PostScript <a href=\"/software/ghostscript/ghostscript.html"
@@ -459,22 +613,41 @@
 "de GNU</a> ne sont pas des outils de programmation ; GNUCash, GNOME et GNU "
 "Chess non plus."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"somecomponents\"></a>For-]{+For+} instance, the <a
+# | href=\"/software/libc/libc.html\">GNU C library</a>.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\">Par exemple</a>, la <a href=\"/software/libc/libc."
 "html\">bibliothèque C de GNU</a>."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"newersystems\"></a>Since-]{+Since+} that was written, a
+# | nearly-all-free Windows-like system has been developed, but technically it
+# | is not at all like GNU or Unix, so it doesn't really affect this issue. 
+# | Most of the kernel of Solaris has been made free, but if you wanted to
+# | make a free system out of that, aside from replacing the missing parts of
+# | the kernel, you would also need to put it into GNU or BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\"></a>Depuis que ceci a été écrit, un système 
presque "
 "entièrement libre de style Windows a été développé, mais techniquement 
il "
@@ -483,15 +656,31 @@
 "voulez en faire un système libre, outre remplacer les parties manquantes du "
 "noyau, vous aurez aussi besoin de l'intégrer à GNU ou BSD."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"gnubsd\"></a>On-]{+On+} the other hand, in the years since this
+# | article was written, the GNU C Library has been ported to several versions
+# | of the BSD kernel, which made it straightforward to combine the GNU system
+# | with that kernel.  Just as with GNU/Linux, these are indeed variants of
+# | GNU, and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD
+# | depending on the kernel of the system.  Ordinary users on typical desktops
+# | can hardly distinguish between GNU/Linux and GNU/*BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
+#| "was written, the GNU C Library has been ported to several versions of the "
+#| "BSD kernel, which made it straightforward to combine the GNU system with "
+#| "that kernel.  Just as with GNU/Linux, these are indeed variants of GNU, "
+#| "and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD "
+#| "depending on the kernel of the system.  Ordinary users on typical "
+#| "desktops can hardly distinguish between GNU/Linux and GNU/*BSD."
+msgid ""
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a id=\"gnubsd\"></a>Toutefois, dans les années qui ont suivi l'écriture de 
"
 "cet article, la bibliothèque C de GNU a été portée sur plusieurs 
versions du "
@@ -545,8 +734,13 @@
 "traduction</a> les infos nécessaires."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+# | Copyright &copy; 1997-2002, [-2007, 2014-2017,-] {+2005, 2008,+} 2019,
+# | 2021 Richard [-M.-] Stallman
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. "
+#| "Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
 
@@ -572,3 +766,6 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
+
+#~ msgid "Notes"
+#~ msgstr "Notes"

Index: gnu/po/linux-and-gnu.hr-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.hr-diff.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- gnu/po/linux-and-gnu.hr-diff.html   30 May 2021 19:32:26 -0000      1.17
+++ gnu/po/linux-and-gnu.hr-diff.html   30 Aug 2021 13:34:54 -0000      1.18
@@ -10,44 +10,49 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.79</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.79</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;Linux and GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU 
HURD, Hurd" /&gt;
 &lt;meta http-equiv="Description" content="Since 1983, developing the free 
Unix style operating system GNU, so that computer users can have the freedom to 
share and improve the software they use." /&gt;
 &lt;!--#include virtual="/gnu/po/linux-and-gnu.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;Linux</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;Linux</em></ins></span> 
and the GNU System&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;Linux and the GNU System&lt;/h2&gt;
 
-<span 
class="removed"><del><strong>&lt;p&gt;&lt;strong&gt;by</strong></del></span>
+<span class="removed"><del><strong>&lt;p&gt;&lt;strong&gt;by &lt;a 
href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;address class="byline 
c"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
-<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;
-
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;For</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;For</em></ins></span> more 
information see also
-the &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;,
+  &lt;blockquote&gt;&lt;p&gt;For more information see also
+the</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;address 
class="byline"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux 
FAQ&lt;/a&gt;,
 and &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;&lt;/p&gt;
-  <span class="removed"><del><strong>&lt;/blockquote&gt;</strong></del></span>
-&lt;/div&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;
+  &lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;
 Many computer users run a modified version of
 &lt;a href="/philosophy/categories.html#TheGNUsystem"&gt;the GNU 
system&lt;/a&gt;
 every day, without realizing it.  Through a peculiar turn of events,
 the version of GNU which is widely used today is often called
-&ldquo;Linux&rdquo;, and many of its users
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> and 
many of its users
 are &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt; not aware&lt;/a&gt;
 that it is basically the GNU system, developed by the
 &lt;a href="/gnu/gnu-history.html"&gt;GNU Project&lt;/a&gt;.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;div class="announcement comment" 
role="complementary"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;p&gt;For more information see also
+the &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;,
+and &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;</em></ins></span>
+
 &lt;p&gt;
 There really is a Linux, and these people are using it, but it is just
 a part of the system they use.  Linux is the kernel: the program in
@@ -63,7 +68,8 @@
 &lt;p&gt;
 Many users do not understand the difference between the kernel, which
 is Linux, and the whole system, which they also call
-&ldquo;Linux&rdquo;.  The ambiguous use of the name doesn't help
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  The 
ambiguous use of the name doesn't help
 people understand.  These users often think that Linus Torvalds
 developed the whole operating system in 1991, with a bit of help.&lt;/p&gt;
 
@@ -100,7 +106,8 @@
 &lt;p&gt;
 If we tried to measure the GNU Project's contribution in this way,
 what would we conclude?  One CD-ROM vendor found that in their &ldquo;Linux
-distribution&rdquo;, &lt;a 
href="/philosophy/categories.html#GNUsoftware"&gt;GNU
+<span class="removed"><del><strong>distribution&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>distribution,&rdquo;</em></ins></span> &lt;a 
href="/philosophy/categories.html#GNUsoftware"&gt;GNU
 software&lt;/a&gt; was the largest single contingent, around 28% of the
 total source code, and this included some of the essential major
 components without which there could be no system.  Linux itself was
@@ -108,7 +115,7 @@
 repository of gNewSense, Linux is 1.5% and GNU packages are 15%.)
 So if you were going to pick a name for the system based on
 who wrote the programs in the system, the most appropriate single
-choice would be &ldquo;GNU&rdquo;.&lt;/p&gt;
+choice would be <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU.&rdquo;&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
 But that is not the deepest way to consider the question.  The GNU
@@ -147,7 +154,7 @@
 Fortunately, we didn't have to wait for the Hurd, because of Linux.
 Once Torvalds freed Linux in 1992, it fit into the last major gap in
 the GNU system.  People could
-then &lt;a 
href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+then &lt;a <span 
class="removed"><del><strong>href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
 combine Linux with the GNU system&lt;/a&gt; to make a complete free system
 &mdash; a version of the GNU system which also contained Linux.  The
 GNU/Linux system, in other words.&lt;/p&gt;
@@ -165,7 +172,7 @@
 
 &lt;p&gt;
 The GNU Project supports GNU/Linux systems as well as &lt;em&gt;the&lt;/em&gt; 
GNU
-system.  The &lt;a href="http://fsf.org/"&gt;FSF&lt;/a&gt; funded the 
rewriting of
+system.  The &lt;a <span 
class="removed"><del><strong>href="http://fsf.org/"&gt;FSF&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://fsf.org/"&gt;FSF&lt;/a&gt;</em></ins></span>
 funded the rewriting of
 the Linux-related extensions to the GNU C library, so that now they
 are well integrated, and the newest GNU/Linux systems use the current
 library release with no changes.  The FSF also funded an early stage
@@ -189,7 +196,7 @@
 be loaded into I/O devices when the system starts, and they are
 included, as long series of numbers, in the "source code" of Linux.
 Thus, maintaining free GNU/Linux distributions now entails maintaining
-a &lt;a href="http://directory.fsf.org/project/linux"&gt; free version of
+a &lt;a <span 
class="removed"><del><strong>href="http://directory.fsf.org/project/linux"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://directory.fsf.org/project/linux"&gt;</em></ins></span>
 free version of
 Linux&lt;/a&gt; too.&lt;/p&gt;
 
 &lt;p&gt;Whether you use GNU/Linux or not, please don't confuse the public
@@ -197,14 +204,16 @@
 kernel, one of the essential major components of the system.  The
 system as a whole is basically the GNU system, with Linux added.  When
 you're talking about this combination, please call it
-&ldquo;GNU/Linux&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.&lt;/p&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
 If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
 reference, this page and &lt;a href="/gnu/the-gnu-project.html"&gt;
-http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt; are good choices.  If
+<span 
class="removed"><del><strong>http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>https://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</em></ins></span>
 are good choices.  If
 you mention Linux, the kernel, and want to add a link for further
-reference, &lt;a 
href="http://foldoc.org/linux"&gt;http://foldoc.org/linux&lt;/a&gt; 
+reference, &lt;a <span 
class="removed"><del><strong>href="http://foldoc.org/linux"&gt;http://foldoc.org/linux&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://foldoc.org/linux"&gt;https://foldoc.org/linux&lt;/a&gt;</em></ins></span>
 
 is a good URL to use.&lt;/p&gt;
 
 <span 
class="removed"><del><strong>&lt;h3&gt;Postscripts&lt;/h3&gt;</strong></del></span>
@@ -235,35 +244,44 @@
 <span 
class="removed"><del><strong>&lt;h3&gt;Notes:&lt;/h3&gt;</strong></del></span>
 <span class="inserted"><ins><em>&lt;div class="column-limit"&gt;&lt;/div&gt;
 
-&lt;h3 class="footnote"&gt;Notes&lt;/h3&gt;</em></ins></span>
+&lt;h3 class="footnote"&gt;Footnotes&lt;/h3&gt;</em></ins></span>
 &lt;ol&gt;
-&lt;li&gt;
-&lt;a id="unexciting"&gt;&lt;/a&gt;These unexciting but essential components
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="unexciting"&gt;&lt;/a&gt;These</strong></del></span>
+<span class="inserted"><ins><em>&lt;li 
id="unexciting"&gt;These</em></ins></span> unexciting but essential components
 include the GNU assembler (GAS) and the linker (GLD), both
 are now part of the &lt;a href="/software/binutils/"&gt;GNU Binutils&lt;/a&gt;
 package, &lt;a href="/software/tar/"&gt;GNU tar&lt;/a&gt;, and many 
more.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="nottools"&gt;&lt;/a&gt;For instance, The Bourne Again SHell (BASH),
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="nottools"&gt;&lt;/a&gt;For</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li id="nottools"&gt;For</em></ins></span> 
instance, The Bourne Again SHell (BASH),
 the PostScript interpreter
 &lt;a href="/software/ghostscript/ghostscript.html"&gt;Ghostscript&lt;/a&gt;, 
and the
 &lt;a href="/software/libc/libc.html"&gt;GNU C library&lt;/a&gt; are not
 programming tools.  Neither are GNUCash, GNOME, and GNU Chess.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="somecomponents"&gt;&lt;/a&gt;For instance, the
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="somecomponents"&gt;&lt;/a&gt;For</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li 
id="somecomponents"&gt;For</em></ins></span> instance, the
 &lt;a href="/software/libc/libc.html"&gt;GNU C library&lt;/a&gt;.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="newersystems"&gt;&lt;/a&gt;Since that was written, a nearly-all-free
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="newersystems"&gt;&lt;/a&gt;Since</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li 
id="newersystems"&gt;Since</em></ins></span> that was written, a nearly-all-free
 Windows-like system has been developed, but technically it is not at
 all like GNU or Unix, so it doesn't really affect this issue.  Most of
 the kernel of Solaris has been made free, but if you wanted to make a
 free system out of that, aside from replacing the missing parts of the
 kernel, you would also need to put it into GNU or BSD.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="gnubsd"&gt;&lt;/a&gt;On the other hand, in the years since this 
article
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="gnubsd"&gt;&lt;/a&gt;On</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li id="gnubsd"&gt;On</em></ins></span> the 
other hand, in the years since this article
 was written, the GNU C Library has been ported to several versions of
 the BSD kernel, which made it straightforward to combine the GNU system
 with that kernel.  Just as with GNU/Linux, these are indeed variants of
@@ -271,10 +289,8 @@
 GNU/kNetBSD depending on the kernel of the system.  Ordinary users on
 typical desktops can hardly distinguish between GNU/Linux and
 GNU/*BSD.&lt;/li&gt;
-
 &lt;/ol&gt;
-<span class="inserted"><ins><em>&lt;/div&gt;
-&lt;/div&gt;</em></ins></span>
+<span class="inserted"><ins><em>&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;
@@ -323,7 +339,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; <span class="removed"><del><strong>1997, 1998, 1999, 
2000, 2001, 2002,</strong></del></span> <span 
class="inserted"><ins><em>1997-2002,</em></ins></span> 2007, <span 
class="removed"><del><strong>2014, 2015, 2016, 2017</strong></del></span> <span 
class="inserted"><ins><em>2014-2017, 2019, 2021</em></ins></span> Richard M. 
Stallman&lt;/p&gt;
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>1997, 1998, 1999, 
2000, 2001, 2002,
+2007, 2014, 2015, 2016, 2017</strong></del></span> <span 
class="inserted"><ins><em>1997-2002, 2005, 2008, 2019, 2021</em></ins></span> 
Richard <span class="removed"><del><strong>M.</strong></del></span> 
Stallman&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
@@ -333,11 +350,12 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/30 19:32:26 $
+$Date: 2021/08/30 13:34:54 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-&lt;/div&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for class="inner", starts 
in the banner include --&gt;</em></ins></span>
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>

Index: gnu/po/linux-and-gnu.hr.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.hr.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- gnu/po/linux-and-gnu.hr.po  30 May 2021 19:32:26 -0000      1.20
+++ gnu/po/linux-and-gnu.hr.po  30 Aug 2021 13:34:54 -0000      1.21
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2013-06-28 20:34+0100\n"
 "Last-Translator: Martina Bebek <martinaporec@gmail.com>\n"
 "Language-Team: www-hr <www-hr-lista@gnu.org>\n"
@@ -43,11 +43,11 @@
 "bi korisnici računala imali slobodu dijeliti i poboljšavati softver kojeg "
 "koriste."
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "Linux i sustav GNU"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 # | by <a [-href=\"http://www.stallman.org/\";><strong>Richard
 # | Stallman</strong></a>-] {+href=\"https://www.stallman.org/\";>Richard
 # | Stallman</a>+}
@@ -59,21 +59,29 @@
 msgstr ""
 "<a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"Za više informacija pogledajte također <a href=\"/gnu/gnu-linux-faq.html\"> 
"
-"ČPP o GNU/Linuxu</a>, i <a href=\"/gnu/why-gnu-linux.html\">Zašto 
GNU/Linux?"
-"</a>"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many computer users run a modified version of <a
+# | href=\"/philosophy/categories.html#TheGNUsystem\">the GNU system</a> every
+# | day, without realizing it.  Through a peculiar turn of events, the version
+# | of GNU which is widely used today is often called [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and many of its users are <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> that it is
+# | basically the GNU system, developed by the <a
+# | href=\"/gnu/gnu-history.html\">GNU Project</a>.
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -88,6 +96,15 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"Za više informacija pogledajte također <a href=\"/gnu/gnu-linux-faq.html\"> 
"
+"ČPP o GNU/Linuxu</a>, i <a href=\"/gnu/why-gnu-linux.html\">Zašto 
GNU/Linux?"
+"</a>"
+
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -107,10 +124,22 @@
 "ili GNU/Linux. Sve takozvane &ldquo;Linux&rdquo; distribucije su zapravo "
 "distribucije GNU/Linuxa."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many users do not understand the difference between the kernel, which is
+# | Linux, and the whole system, which they also call [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} The ambiguous use of the name doesn't help people
+# | understand.  These users often think that Linus Torvalds developed the
+# | whole operating system in 1991, with a bit of help.
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -120,7 +149,7 @@
 "imena ne pomaže u razumijevanju. Ovi korisnici često misle da je Linus "
 "Torvalds, uz malu pomoć, razvio cijeli operativni sustav 1991. godine."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -138,7 +167,7 @@
 "nju i pronašli kako je (bez nekog naročitog razloga) gotovo sve potrebno za 
"
 "sustav nalik Unixu već bilo dostupno."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free software</"
@@ -158,7 +187,7 @@
 "neke od izvornih nacrta sustava GNU. Do trenutka kada je započet Linux, GNU "
 "je već bio gotovo dovršen."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -174,18 +203,42 @@
 "mjeriti doprinos projekata ovakve vrste određenim programima koji su iz "
 "projekta proizišli."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If we tried to measure the GNU Project's contribution in this way, what
+# | would we conclude? One CD-ROM vendor found that in their &ldquo;Linux
+# | [-distribution&rdquo;,-] {+distribution,&rdquo;+} <a
+# | href=\"/philosophy/categories.html#GNUsoftware\">GNU software</a> was the
+# | largest single contingent, around 28% of the total source code, and this
+# | included some of the essential major components without which there could
+# | be no system.  Linux itself was about 3%.  (The proportions in 2008 are
+# | similar: in the &ldquo;main&rdquo; repository of gNewSense, Linux is 1.5%
+# | and GNU packages are 15%.)  So if you were going to pick a name for the
+# | system based on who wrote the programs in the system, the most appropriate
+# | single choice would be [-&ldquo;GNU&rdquo;.-] {+&ldquo;GNU.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "If we tried to measure the GNU Project's contribution in this way, what "
+#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
+#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
+#| "\">GNU software</a> was the largest single contingent, around 28% of the "
+#| "total source code, and this included some of the essential major "
+#| "components without which there could be no system.  Linux itself was "
+#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
+#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
+#| "15%.)  So if you were going to pick a name for the system based on who "
+#| "wrote the programs in the system, the most appropriate single choice "
+#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "Što bismo zaključili ako bismo pokušali na ovaj način mjeriti doprinos "
 "Projekta GNU? Jedan isporučitelj CD-ROM-ova utvrdio je da je u njihovoj "
@@ -198,7 +251,7 @@
 "sustava na temelju toga tko je napisao programe u sustavu, najprikladniji "
 "izbor bio bi &ldquo;GNU&rdquo;."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -214,7 +267,7 @@
 "teksta, premda smo i njega razvili. Projekt GNU krenuo je razvijati "
 "<em>potpun slobodan sustav nalik Unixu</em>: GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -242,7 +295,7 @@
 "alati <a href=\"#nottools\">(2)</a>.  Čak smo razvili i igru šaha, GNU "
 "Chess, jer potpun sustav treba i igre."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -257,11 +310,27 @@
 "href=\"/software/hurd/hurd-and-linux.html\">GNU Hurd postao je stabilan "
 "2001. godine</a>, ali još je daleko od toga da bude spreman za opću 
upotrebu."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once
+# | Torvalds freed Linux in 1992, it fit into the last major gap in the GNU
+# | system.  People could then <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | combine Linux with the GNU system</a> to make a complete free system
+# | &mdash; a version of the GNU system which also contained Linux.  The
+# | GNU/Linux system, in other words.
+#, fuzzy
+#| msgid ""
+#| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
+#| "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
+#| "system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+#| "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the "
+#| "GNU system</a> to make a complete free system &mdash; a version of the "
+#| "GNU system which also contained Linux.  The GNU/Linux system, in other "
+#| "words."
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -273,7 +342,7 @@
 "sustavom GNU</a> kako bi napravili potpun slobodan sustav &mdash; inačicu "
 "sustava GNU koja je sadržavala i Linux, drugim riječima, sustav GNU/Linux."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -294,11 +363,25 @@
 "razvijali razne distribucije sustava napravili su mnogo neophodnog posla. No "
 "bio je to posao koji je, po prirodi stvari, netko svakako morao napraviti."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU
+# | system.  The <a href=\"http{+s+}://fsf.org/\">FSF</a> funded the rewriting
+# | of the Linux-related extensions to the GNU C library, so that now they are
+# | well integrated, and the newest GNU/Linux systems use the current library
+# | release with no changes.  The FSF also funded an early stage of the
+# | development of Debian GNU/Linux.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -310,7 +393,7 @@
 "biblioteke bez izmjena. FSF je također financirao rani stadij razvoja Debian 
"
 "GNU/Linuxa."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Today there are many different variants of the GNU/Linux system (often
 # | called &ldquo;distros&rdquo;).  Most of them include nonfree
 # | [-software&mdash;their-] {+programs&mdash;their+} developers follow the <a
@@ -353,14 +436,31 @@
 "Linux distre</a>.  FSF podupire računalne sadržaje <a href=\"http://";
 "gnewsense.org/\">gNewSensea</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Making a free GNU/Linux distribution is not just a matter of eliminating
+# | various nonfree programs.  Nowadays, the usual version of Linux contains
+# | nonfree programs too.  These programs are intended to be loaded into I/O
+# | devices when the system starts, and they are included, as long series of
+# | numbers, in the \"source code\" of Linux.  Thus, maintaining free
+# | GNU/Linux distributions now entails maintaining a <a
+# | href=\"http{+s+}://directory.fsf.org/project/linux\"> free version of
+# | Linux</a> too.
+#, fuzzy
+#| msgid ""
+#| "Making a free GNU/Linux distribution is not just a matter of eliminating "
+#| "various nonfree programs.  Nowadays, the usual version of Linux contains "
+#| "nonfree programs too.  These programs are intended to be loaded into I/O "
+#| "devices when the system starts, and they are included, as long series of "
+#| "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/"
+#| "Linux distributions now entails maintaining a <a href=\"http://directory.";
+#| "fsf.org/project/linux\"> free version of Linux</a> too."
 msgid ""
 "Making a free GNU/Linux distribution is not just a matter of eliminating "
 "various nonfree programs.  Nowadays, the usual version of Linux contains "
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 "Stvaranje slobodne distribucije GNU/Linuxa nije samo stvar uklanjanja raznih "
@@ -371,13 +471,26 @@
 "distribucija GNU/Linuxa sada povlači za sobom i održavanje <a 
href=\"http://";
 "directory.fsf.org/project/linux\"> slobodne inačice Linuxa</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Whether you use GNU/Linux or not, please don't confuse the public by using
+# | the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the
+# | essential major components of the system.  The system as a whole is
+# | basically the GNU system, with Linux added.  When you're talking about
+# | this combination, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Koristili ili ne GNU/Linux, molimo nemojte zbunjivati javnost nejasnom "
 "upotrebom naziva &ldquo;Linux&rdquo;.  Linux je jezgra, jedna od temeljnih "
@@ -385,13 +498,29 @@
 "je dodan Linux. Kada govorite o toj kombinaciji, molimo zovite je &ldquo;GNU/"
 "Linux&rdquo;."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
+# | reference, this page and <a href=\"/gnu/the-gnu-project.html\">
+# | http{+s+}://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
+# | you mention Linux, the kernel, and want to add a link for further
+# | reference, <a
+# | [-href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a>-]
+# | {+href=\"https://foldoc.org/linux\";>https://foldoc.org/linux</a>+} is a
+# | good URL to use.
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "Ukoliko želite napraviti poveznicu na &ldquo;GNU/Linux&rdquo; za daljnje "
 "povezivanje, ova stranica i <a href=\"/gnu/the-gnu-project.html\"> http://";
@@ -399,11 +528,11 @@
 "Linux, jezgru, i želite dodati poveznicu, <a href=\"http://foldoc.org/linux";
 "\">http://foldoc.org/linux</a> je dobra adresa."
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr "Dopuna"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Aside from GNU, one other project has independently produced a free Unix-"
 "like operating system.  This system is known as BSD, and it was developed at "
@@ -419,7 +548,7 @@
 "\"#newersystems\">(4)</a> gotovo sigurno su ili inačica sustava GNU ili neka 
"
 "vrsta sustava BSD."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -441,54 +570,94 @@
 "sustavu GNU pa ime kao Å¡to je GNU/BSD ne bi odgovaralo prilikama.<a href="
 "\"#gnubsd\">(5)</a>"
 
-#. type: Content of: <div><div><h3>
-# | Notes[-:-]
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Footnotes"
+msgid "Footnotes"
+msgstr "Fusnote."
+
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"unexciting\"></a>These-]{+These+} unexciting but essential
+# | components include the GNU assembler (GAS) and the linker (GLD), both are
+# | now part of the <a href=\"/software/binutils/\">GNU Binutils</a> package,
+# | <a href=\"/software/tar/\">GNU tar</a>, and many more.
 #, fuzzy
-#| msgid "Notes:"
-msgid "Notes"
-msgstr "Napomene"
-
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+#| msgid ""
+#| "<a id=\"unexciting\"></a>These unexciting but essential components "
+#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
+#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
+#| "\"/software/tar/\">GNU tar</a>, and many more."
+msgid ""
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\"></a>Ove neuzbudljive ali ključne komponente uključuju "
 "GNU asembler (GAS) i linker (GLD)&mdash;oba su sada dio <a href=\"/software/"
 "binutils/\">GNU Binutils</a> paketa, <a href=\"/software/tar/\">GNU tar</a>, "
 "i mnoge druge."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"nottools\"></a>For-]{+For+} instance, The Bourne Again SHell
+# | (BASH), the PostScript interpreter <a
+# | href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the
+# | <a href=\"/software/libc/libc.html\">GNU C library</a> are not programming
+# | tools.  Neither are GNUCash, GNOME, and GNU Chess.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\"></a>Na primjer, Bourne Again SHell (BASH), interpreter "
 "PostScripta <a href=\"/software/ghostscript/ghostscript.html\">Ghostscript</"
 "a> i <a href=\"/software/libc/libc.html\">biblioteka GNU C</a> nisu "
 "programski alati. Nisu to ni GNUCash, GNOME, niti GNU Chess."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"somecomponents\"></a>For-]{+For+} instance, the <a
+# | href=\"/software/libc/libc.html\">GNU C library</a>.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\"></a>Na primjer, <a href=\"/software/libc/libc.html"
 "\">biblioteka GNU C</a>."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"newersystems\"></a>Since-]{+Since+} that was written, a
+# | nearly-all-free Windows-like system has been developed, but technically it
+# | is not at all like GNU or Unix, so it doesn't really affect this issue. 
+# | Most of the kernel of Solaris has been made free, but if you wanted to
+# | make a free system out of that, aside from replacing the missing parts of
+# | the kernel, you would also need to put it into GNU or BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\"></a>Nakon Å¡to je ovo napisano, razvijen je gotovo "
 "potpuno slobodan sustav nalik sustavu Windows, no on tehnički uopće nije "
@@ -497,15 +666,31 @@
 "napraviti slobodan sustav, osim nadomještanja nedostajućih dijelova jezgre, 
"
 "morali biste ga također smjestiti u GNU ili BSD."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"gnubsd\"></a>On-]{+On+} the other hand, in the years since this
+# | article was written, the GNU C Library has been ported to several versions
+# | of the BSD kernel, which made it straightforward to combine the GNU system
+# | with that kernel.  Just as with GNU/Linux, these are indeed variants of
+# | GNU, and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD
+# | depending on the kernel of the system.  Ordinary users on typical desktops
+# | can hardly distinguish between GNU/Linux and GNU/*BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
+#| "was written, the GNU C Library has been ported to several versions of the "
+#| "BSD kernel, which made it straightforward to combine the GNU system with "
+#| "that kernel.  Just as with GNU/Linux, these are indeed variants of GNU, "
+#| "and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD "
+#| "depending on the kernel of the system.  Ordinary users on typical "
+#| "desktops can hardly distinguish between GNU/Linux and GNU/*BSD."
+msgid ""
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a id=\"gnubsd\"></a>S druge strane, u godinama nakon što je ovaj članak "
 "napisan, biblioteka GNU C prenesena je na više inačica jezgre BSD-a, što 
je "
@@ -565,15 +750,13 @@
 "prijevode</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; [-1997, 1998, 1999, 2000, 2001, 2002,-] {+1997-2002,+}
-# | 2007, [-2014, 2015, 2016, 2017-] {+2014-2017, 2019, 2021+} Richard M.
-# | Stallman
+# | Copyright &copy; [-1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014, 2015,
+# | 2016, 2017-] {+1997-2002, 2005, 2008, 2019, 2021+} Richard [-M.-] Stallman
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014, 2015, "
 #| "2016, 2017 Richard M. Stallman"
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014, 2015, 2016, "
 "2017 Richard M. Stallman"
@@ -598,6 +781,11 @@
 msgid "Updated:"
 msgstr "Zadnji put promijenjeno:"
 
+#, fuzzy
+#~| msgid "Notes:"
+#~ msgid "Notes"
+#~ msgstr "Napomene"
+
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"

Index: gnu/po/linux-and-gnu.id.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.id.po,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- gnu/po/linux-and-gnu.id.po  7 Apr 2021 18:04:01 -0000       1.35
+++ gnu/po/linux-and-gnu.id.po  30 Aug 2021 13:34:54 -0000      1.36
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2010-01-23 12:58-0700\n"
 "Last-Translator: Ridzki Samsulhadi <akbar_ddgood@yahoo.com>\n"
 "Language-Team: Indonesian <web-translators-id@gnu.org>\n"
@@ -38,12 +38,12 @@
 "GNU, sehingga para pengguna komputer dapat secara bebas berbagi serta "
 "mempercanggih perangkat lunak yang mereka gunakan."
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "Linux dan sistem GNU"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 # | [-<strong>by-]{+by+} <a [-href=\"http://www.stallman.org/\";>Richard
 # | Stallman</a></strong>-] {+href=\"https://www.stallman.org/\";>Richard
 # | Stallman</a>+}
@@ -56,21 +56,29 @@
 "<strong>oleh <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 "strong>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"Untuk keterangan lebih lanjut lihat juga (Bahasa Inggris) <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, dan <a href=\"/gnu/why-gnu-linux.html"
-"\">Kenapa GNU/Linux?</a>"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many computer users run a modified version of <a
+# | href=\"/philosophy/categories.html#TheGNUsystem\">the GNU system</a> every
+# | day, without realizing it.  Through a peculiar turn of events, the version
+# | of GNU which is widely used today is often called [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and many of its users are <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> that it is
+# | basically the GNU system, developed by the <a
+# | href=\"/gnu/gnu-history.html\">GNU Project</a>.
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -85,6 +93,15 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"Untuk keterangan lebih lanjut lihat juga (Bahasa Inggris) <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, dan <a href=\"/gnu/why-gnu-linux.html"
+"\">Kenapa GNU/Linux?</a>"
+
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -106,10 +123,22 @@
 "ditambahkan dengan Linux, disebut GNU/Linux. Semua distribusi yang dikenal "
 "sebagai &ldquo;Linux&rdquo; sebenarnya adalah distribusi GNU/Linux. "
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many users do not understand the difference between the kernel, which is
+# | Linux, and the whole system, which they also call [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} The ambiguous use of the name doesn't help people
+# | understand.  These users often think that Linus Torvalds developed the
+# | whole operating system in 1991, with a bit of help.
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -121,7 +150,7 @@
 "Torvalds mengembangkan keseluruhan sistem operasi Linux (dengan hanya "
 "sedikit bantuan dari orang lain)."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -141,7 +170,7 @@
 "seluruh prasyarat untuk membangun sebuah sistem berbasis Unix yang lengkap "
 "telah tersedia. "
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | What they found was no accident&mdash;it was the not-quite-complete GNU
 # | system.  The available <a href=\"/philosophy/free-sw.html\">free
 # | software</a> added up to a complete system because the GNU Project had
@@ -183,7 +212,7 @@
 "memaparkan rangkaian-rangkaian dari rencana awal pengembangan sistem GNU. "
 "Ketika Linux dirilis untuk pertama kalinya, sistem GNU sudah hampir selesai "
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -199,18 +228,42 @@
 "X Window System). Hal di atas memperjelas kontribusi-kontribusi yang "
 "diberikan oleh masing-masing program yang dikembangkan tersebut."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If we tried to measure the GNU Project's contribution in this way, what
+# | would we conclude? One CD-ROM vendor found that in their &ldquo;Linux
+# | [-distribution&rdquo;,-] {+distribution,&rdquo;+} <a
+# | href=\"/philosophy/categories.html#GNUsoftware\">GNU software</a> was the
+# | largest single contingent, around 28% of the total source code, and this
+# | included some of the essential major components without which there could
+# | be no system.  Linux itself was about 3%.  (The proportions in 2008 are
+# | similar: in the &ldquo;main&rdquo; repository of gNewSense, Linux is 1.5%
+# | and GNU packages are 15%.)  So if you were going to pick a name for the
+# | system based on who wrote the programs in the system, the most appropriate
+# | single choice would be [-&ldquo;GNU&rdquo;.-] {+&ldquo;GNU.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "If we tried to measure the GNU Project's contribution in this way, what "
+#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
+#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
+#| "\">GNU software</a> was the largest single contingent, around 28% of the "
+#| "total source code, and this included some of the essential major "
+#| "components without which there could be no system.  Linux itself was "
+#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
+#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
+#| "15%.)  So if you were going to pick a name for the system based on who "
+#| "wrote the programs in the system, the most appropriate single choice "
+#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "Jika kita coba mengukur basarnya kontribusi dari proyek GNU, kira-kira "
 "sebesar apa? sebuah vendor CD-ROM menemukan bahwa di dalam &ldquo;distribusi "
@@ -224,7 +277,7 @@
 "kontribusi komponen-komponen di dalamnya, maka seharusnya namanya adalah "
 "&ldquo;GNU&rdquo;."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -240,7 +293,7 @@
 "editor, walaupun kami memang melakukannya juga. Tujuan utama dari proyek GNU "
 "adalah membangun <em> sistem bebas berbasis Unix yang sempurna</em>: GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -270,7 +323,7 @@
 "mengembangkan sebuah permainan catur, GNU Chess, karena sebuah sistem yang "
 "sempurna juga membutuhkan permainan."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -287,11 +340,11 @@
 "secara penuh tahun 2001</a>, tetapi masih belum cukup siap untuk digunakan "
 "oleh semua pihak secara umum."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once
 # | Torvalds [-wrote Linux,-] {+freed Linux in 1992,+} it fit into the last
 # | major gap in the GNU system.  People could then <a
-# | 
href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
 # | combine Linux with the GNU system</a> to make a complete free [-system:-]
 # | {+system &mdash;+} a [-Linux-based-] version of the GNU [-system; the-]
 # | {+system which also contained Linux.  The+} GNU/Linux system, [-for
@@ -307,7 +360,7 @@
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -319,7 +372,7 @@
 "sebuah sistem yang sempurna: yaitu versi sistem GNU berbasis Linux, atau "
 "singkatnya sistem GNU/Linux."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -341,11 +394,25 @@
 "dikembangkan oleh masing-masing pihak yang mengembangkan distribusi-"
 "distribusi secara mandiri."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU
+# | system.  The <a href=\"http{+s+}://fsf.org/\">FSF</a> funded the rewriting
+# | of the Linux-related extensions to the GNU C library, so that now they are
+# | well integrated, and the newest GNU/Linux systems use the current library
+# | release with no changes.  The FSF also funded an early stage of the
+# | development of Debian GNU/Linux.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -358,7 +425,7 @@
 "FSF juga sempat membiayai tahap awal dari pengembangan sistem Debian GNU/"
 "Linux."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Today there are many different variants of the GNU/Linux system (often
 # | called &ldquo;distros&rdquo;).  Most of them include [-non-free
 # | software&mdash;their-] {+nonfree programs&mdash;their+} developers follow
@@ -398,15 +465,15 @@
 "FSF mendukung fasilitas komputer untuk <a href=\"http://gnewsense.org/";
 "\">gNewSense</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Making a free GNU/Linux distribution is not just a matter of eliminating
 # | various non[---]free programs.  Nowadays, the usual version of Linux
 # | contains non[---]free programs too.  These programs are intended to be
 # | loaded into I/O devices when the system starts, and they are included, as
 # | long series of numbers, in the \"source code\" of Linux.  Thus,
 # | maintaining free GNU/Linux distributions now entails maintaining a <a
-# | href=\"http://directory.fsf.org/project/linux\";> free version of Linux</a>
-# | too.
+# | href=\"http{+s+}://directory.fsf.org/project/linux\"> free version of
+# | Linux</a> too.
 #, fuzzy
 #| msgid ""
 #| "Making a free GNU/Linux distribution is not just a matter of eliminating "
@@ -422,7 +489,7 @@
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 "Membuat sebuah distribusi GNU/Linux yang 100% bebas bukan hanya perihal "
@@ -434,13 +501,26 @@
 "<em>maintenance</em> <a href=\"http://directory.fsf.org/project/linux";
 "\">versi bebas dari Linux</a>. "
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Whether you use GNU/Linux or not, please don't confuse the public by using
+# | the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the
+# | essential major components of the system.  The system as a whole is
+# | basically the GNU system, with Linux added.  When you're talking about
+# | this combination, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Terlepas dari apakah sistem yang digunakan adalah GNU/Linux atau bukan, "
 "diharapkan para pengguna tidak bingung dengan pernyataan publik yang "
@@ -449,13 +529,29 @@
 "GNU, yang ditambahkan dengan Linux. Ketika membicarakan tentang kombinasi "
 "sistem tersebut, lebih baik sebut sebagai sistem &ldquo;GNU/Linux&rdquo;."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
+# | reference, this page and <a href=\"/gnu/the-gnu-project.html\">
+# | http{+s+}://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
+# | you mention Linux, the kernel, and want to add a link for further
+# | reference, <a
+# | [-href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a>-]
+# | {+href=\"https://foldoc.org/linux\";>https://foldoc.org/linux</a>+} is a
+# | good URL to use.
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "Jika anda ingin menjelaskan tentang &ldquo;GNU/Linux&rdquo; maka mohon "
 "gunakan link ini sebagai referensi yang tepat: <a href=\"/gnu/the-gnu-"
@@ -463,12 +559,12 @@
 "dijelaskan adalah kernelnya, maka halaman referensi yang tepat adalah ini: "
 "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a>."
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 #, fuzzy
 msgid "Postscripts"
 msgstr "Tambahan"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Aside from GNU, one other project has independently produced a free
 # | Unix-like operating system.  This system is known as BSD, and it was
 # | developed at UC Berkeley.  It was non[---]free in the 80s, but became free
@@ -498,7 +594,7 @@
 "90an. Setiap sistem operasi bebas modern<a href=\"#newersystems\">(4)</a> "
 "dapat dipastikan merupakan varian dari salah satu sistem GNU atau sistem BSD."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -520,32 +616,53 @@
 "kernel untuk dimasukkan ke sistem GNU, sehingga nama GNU/BSD tidak cocok "
 "disebutkan dari perspektif ini.<a href=\"#gnubsd\">(5)</a>"
 
-#. type: Content of: <div><div><h3>
-# | Notes[-:-]
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Footnotes"
+msgid "Footnotes"
+msgstr "Catatan Kaki"
+
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"unexciting\"></a>These-]{+These+} unexciting but essential
+# | components include the GNU assembler (GAS) and the linker (GLD), both are
+# | now part of the <a href=\"/software/binutils/\">GNU Binutils</a> package,
+# | <a href=\"/software/tar/\">GNU tar</a>, and many more.
 #, fuzzy
-#| msgid "Notes:"
-msgid "Notes"
-msgstr "Catatan:"
-
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+#| msgid ""
+#| "<a id=\"unexciting\"></a>These unexciting but essential components "
+#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
+#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
+#| "\"/software/tar/\">GNU tar</a>, and many more."
+msgid ""
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\"></a>Komponen-komponen yang penting termasuk <em>GNU "
 "assembler (GAS) and the linker (GLD)</em>, keduanya merupakan bagian dari "
 "paket <a href=\"/software/binutils/\">GNU Binutils</a>, <a href=\"/software/"
 "tar/\">GNU tar</a>, dan sebagainya."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"nottools\"></a>For-]{+For+} instance, The Bourne Again SHell
+# | (BASH), the PostScript interpreter <a
+# | href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the
+# | <a href=\"/software/libc/libc.html\">GNU C library</a> are not programming
+# | tools.  Neither are GNUCash, GNOME, and GNU Chess.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\"></a>Misalnya, Bourne Again SHell (BASH), PostScript "
 "interpreter <a href=\"/software/ghostscript/ghostscript.html\">Ghostscript</"
@@ -553,22 +670,41 @@
 "<em>programming tools</em>.  Begitu juga dengan GNUCash, GNOME, dan GNU "
 "Chess."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"somecomponents\"></a>For-]{+For+} instance, the <a
+# | href=\"/software/libc/libc.html\">GNU C library</a>.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\"></a>Misalnya, <a href=\"/software/libc/libc.html"
 "\">GNU C library</a>."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"newersystems\"></a>Since-]{+Since+} that was written, a
+# | nearly-all-free Windows-like system has been developed, but technically it
+# | is not at all like GNU or Unix, so it doesn't really affect this issue. 
+# | Most of the kernel of Solaris has been made free, but if you wanted to
+# | make a free system out of that, aside from replacing the missing parts of
+# | the kernel, you would also need to put it into GNU or BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\"></a>Sebuah sistem berbasis Windows yang hampir bebas "
 "juga telah dikembangkan, tetapi secara teknis itu sama sekali berbeda dengan "
@@ -577,15 +713,15 @@
 "100% bebas, selain untuk kernelnya, bagian-bagian lain pada akhrinya juga "
 "akan bergantung pada GNU atau BSD."
 
-#. type: Content of: <div><div><ol><li>
-# | <a id=\"gnubsd\"></a>On the other hand, in the years since this article
-# | was written, the GNU C Library has been ported to {+several versions of+}
-# | the BSD kernel, which made it [-possible-] {+straightforward+} to combine
-# | the GNU system with that kernel.  Just as with GNU/Linux, these are indeed
-# | variants of GNU, and are therefore [-called-] {+called, for instance,+}
-# | GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the system. 
-# | Ordinary users on typical desktops can hardly distinguish between
-# | GNU/Linux and GNU/*BSD.
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"gnubsd\"></a>On-]{+On+} the other hand, in the years since this
+# | article was written, the GNU C Library has been ported to {+several
+# | versions of+} the BSD kernel, which made it [-possible-]
+# | {+straightforward+} to combine the GNU system with that kernel.  Just as
+# | with GNU/Linux, these are indeed variants of GNU, and are therefore
+# | [-called-] {+called, for instance,+} GNU/kFreeBSD and GNU/kNetBSD
+# | depending on the kernel of the system.  Ordinary users on typical desktops
+# | can hardly distinguish between GNU/Linux and GNU/*BSD.
 #, fuzzy
 #| msgid ""
 #| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
@@ -596,13 +732,13 @@
 #| "system.  Ordinary users on typical desktops can hardly distinguish "
 #| "between GNU/Linux and GNU/*BSD."
 msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a id=\"gnubsd\"></a>Di lain pihak, Sejak artikel ini pertama kali ditulis, "
 "GNU C Library juga telah dimasukkan ke dalam kernel BSD, sehingga "
@@ -666,8 +802,7 @@
 
 #. type: Content of: <div><p>
 #, fuzzy
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007 Richard M. Stallman"
 
@@ -693,6 +828,11 @@
 msgid "Updated:"
 msgstr "Perubahan terakhir:"
 
+#, fuzzy
+#~| msgid "Notes:"
+#~ msgid "Notes"
+#~ msgstr "Catatan:"
+
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"

Index: gnu/po/linux-and-gnu.it.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.it.po,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- gnu/po/linux-and-gnu.it.po  7 Jun 2021 08:29:31 -0000       1.75
+++ gnu/po/linux-and-gnu.it.po  30 Aug 2021 13:34:54 -0000      1.76
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-02-04 19:01-0500\n"
 "Last-Translator: Dora Scilipoti\n"
 "Language-Team: Italian\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-08-30 13:26+0000\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: Poedit 2.2\n"
 
@@ -46,31 +47,38 @@
 "che utilizzano."
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "Linux e il sistema GNU"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "di <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-# type: Content of: <div><blockquote><p>
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"Per ulteriori informazioni vedere anche le <a href=\"/gnu/gnu-linux-faq.html"
-"\">domande frequenti su GNU/Linux</a> e <a href=\"/gnu/why-gnu-linux.html"
-"\">Perché GNU/Linux?</a>"
-
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many computer users run a modified version of <a
+# | href=\"/philosophy/categories.html#TheGNUsystem\">the GNU system</a> every
+# | day, without realizing it.  Through a peculiar turn of events, the version
+# | of GNU which is widely used today is often called [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and many of its users are <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> that it is
+# | basically the GNU system, developed by the <a
+# | href=\"/gnu/gnu-history.html\">GNU Project</a>.
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -83,9 +91,19 @@
 "html\">non sanno</a> che si tratta fondamentalmente del sistema GNU, "
 "sviluppato dal <a href=\"/gnu/gnu-history.html\">Progetto GNU</a>."
 
-# type: Content of: <p>
+# type: Content of: <div><blockquote><p>
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"Per ulteriori informazioni vedere anche le <a href=\"/gnu/gnu-linux-faq.html"
+"\">domande frequenti su GNU/Linux</a> e <a href=\"/gnu/why-gnu-linux.html"
+"\">Perché GNU/Linux?</a>"
+
+# type: Content of: <p>
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -108,10 +126,22 @@
 "distribuzioni GNU/Linux."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many users do not understand the difference between the kernel, which is
+# | Linux, and the whole system, which they also call [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} The ambiguous use of the name doesn't help people
+# | understand.  These users often think that Linus Torvalds developed the
+# | whole operating system in 1991, with a bit of help.
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -123,7 +153,7 @@
 "operativo nel 1991."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -143,7 +173,7 @@
 "costruire un sistema simile a Unix era già disponibile."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free software</"
@@ -165,7 +195,7 @@
 "cominci&ograve; a scrivere Linux, GNU era gi&agrave; quasi finito."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -183,18 +213,42 @@
 "hanno prodotto."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If we tried to measure the GNU Project's contribution in this way, what
+# | would we conclude? One CD-ROM vendor found that in their &ldquo;Linux
+# | [-distribution&rdquo;,-] {+distribution,&rdquo;+} <a
+# | href=\"/philosophy/categories.html#GNUsoftware\">GNU software</a> was the
+# | largest single contingent, around 28% of the total source code, and this
+# | included some of the essential major components without which there could
+# | be no system.  Linux itself was about 3%.  (The proportions in 2008 are
+# | similar: in the &ldquo;main&rdquo; repository of gNewSense, Linux is 1.5%
+# | and GNU packages are 15%.)  So if you were going to pick a name for the
+# | system based on who wrote the programs in the system, the most appropriate
+# | single choice would be [-&ldquo;GNU&rdquo;.-] {+&ldquo;GNU.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "If we tried to measure the GNU Project's contribution in this way, what "
+#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
+#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
+#| "\">GNU software</a> was the largest single contingent, around 28% of the "
+#| "total source code, and this included some of the essential major "
+#| "components without which there could be no system.  Linux itself was "
+#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
+#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
+#| "15%.)  So if you were going to pick a name for the system based on who "
+#| "wrote the programs in the system, the most appropriate single choice "
+#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "Se provassimo a quantificare il contributo del Progetto GNU in base a questo "
 "criterio, a quale conclusione arriveremmo? Un distributore di CD-ROM "
@@ -209,7 +263,7 @@
 "che ne fanno parte, la scelta pi&ugrave; appropriata sarebbe \"GNU\"."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -227,7 +281,7 @@
 "libero completo simile a Unix: GNU."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -259,7 +313,7 @@
 "sistema completo ha bisogno anche di giochi. "
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -277,11 +331,27 @@
 "manca ancora molto per renderlo usabile da parte del pubblico. "
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once
+# | Torvalds freed Linux in 1992, it fit into the last major gap in the GNU
+# | system.  People could then <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | combine Linux with the GNU system</a> to make a complete free system
+# | &mdash; a version of the GNU system which also contained Linux.  The
+# | GNU/Linux system, in other words.
+#, fuzzy
+#| msgid ""
+#| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
+#| "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
+#| "system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+#| "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the "
+#| "GNU system</a> to make a complete free system &mdash; a version of the "
+#| "GNU system which also contained Linux.  The GNU/Linux system, in other "
+#| "words."
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -295,7 +365,7 @@
 "Linux; in altre parole, il sistema GNU/Linux."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -318,11 +388,25 @@
 "cose, era comunque destinato ad essere portato a termine da qualcuno."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU
+# | system.  The <a href=\"http{+s+}://fsf.org/\">FSF</a> funded the rewriting
+# | of the Linux-related extensions to the GNU C library, so that now they are
+# | well integrated, and the newest GNU/Linux systems use the current library
+# | release with no changes.  The FSF also funded an early stage of the
+# | development of Debian GNU/Linux.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -335,7 +419,7 @@
 "anche finanziato una prima fase di sviluppo di Debian GNU/Linux."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Today there are many different variants of the GNU/Linux system (often "
 "called &ldquo;distros&rdquo;).  Most of them include nonfree programs&mdash;"
@@ -357,14 +441,31 @@
 "libere</a>. La FSF fornisce le strutture informatiche per alcune di queste. "
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Making a free GNU/Linux distribution is not just a matter of eliminating
+# | various nonfree programs.  Nowadays, the usual version of Linux contains
+# | nonfree programs too.  These programs are intended to be loaded into I/O
+# | devices when the system starts, and they are included, as long series of
+# | numbers, in the \"source code\" of Linux.  Thus, maintaining free
+# | GNU/Linux distributions now entails maintaining a <a
+# | href=\"http{+s+}://directory.fsf.org/project/linux\"> free version of
+# | Linux</a> too.
+#, fuzzy
+#| msgid ""
+#| "Making a free GNU/Linux distribution is not just a matter of eliminating "
+#| "various nonfree programs.  Nowadays, the usual version of Linux contains "
+#| "nonfree programs too.  These programs are intended to be loaded into I/O "
+#| "devices when the system starts, and they are included, as long series of "
+#| "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/"
+#| "Linux distributions now entails maintaining a <a href=\"http://directory.";
+#| "fsf.org/project/linux\"> free version of Linux</a> too."
 msgid ""
 "Making a free GNU/Linux distribution is not just a matter of eliminating "
 "various nonfree programs.  Nowadays, the usual version of Linux contains "
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 "Per ottenere una distribuzione libera non basta eliminare i vari programmi "
@@ -377,13 +478,26 @@
 "versione libera di Linux</a>."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Whether you use GNU/Linux or not, please don't confuse the public by using
+# | the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the
+# | essential major components of the system.  The system as a whole is
+# | basically the GNU system, with Linux added.  When you're talking about
+# | this combination, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Sia che usiate GNU/Linux o meno, vi preghiamo di non confondere il pubblico "
 "utilizzando la forma &ldquo;Linux&rdquo; in modo ambiguo. Linux &egrave; il "
@@ -393,13 +507,29 @@
 "dicitura &ldquo;GNU/Linux&rdquo;. "
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
+# | reference, this page and <a href=\"/gnu/the-gnu-project.html\">
+# | http{+s+}://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
+# | you mention Linux, the kernel, and want to add a link for further
+# | reference, <a
+# | [-href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a>-]
+# | {+href=\"https://foldoc.org/linux\";>https://foldoc.org/linux</a>+} is a
+# | good URL to use.
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "Chi desiderasse  dei collegamenti di riferimento per il termine &ldquo;GNU/"
 "Linux&rdquo;, pu&ograve; utilizzare questa pagina oppure <a href=\"/gnu/the-"
@@ -407,12 +537,12 @@
 "kernel Linux invece si pu&ograve; usare questo indirizzo di riferimento: <a "
 "href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a>."
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr "Post scriptum"
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Aside from GNU, one other project has independently produced a free Unix-"
 "like operating system.  This system is known as BSD, and it was developed at "
@@ -430,7 +560,7 @@
 "sistema GNU o un tipo di BSD."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -454,17 +584,28 @@
 "una dicitura del tipo GNU/BSD sarebbe inappropriata. <a href=\"#gnubsd\">(5)"
 "</a>"
 
-#. type: Content of: <div><div><h3>
-msgid "Notes"
+# type: Content of: <h4>
+#. type: Content of: <div><h3>
+msgid "Footnotes"
 msgstr "Note"
 
 # type: Content of: <ol><li>
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"unexciting\"></a>These-]{+These+} unexciting but essential
+# | components include the GNU assembler (GAS) and the linker (GLD), both are
+# | now part of the <a href=\"/software/binutils/\">GNU Binutils</a> package,
+# | <a href=\"/software/tar/\">GNU tar</a>, and many more.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"unexciting\"></a>These unexciting but essential components "
+#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
+#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
+#| "\"/software/tar/\">GNU tar</a>, and many more."
+msgid ""
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\"></a>Questi componenti tediosi ma essenziali sono "
 "l'assemblatore GNU (GAS) e il linker (GLD), che ora fanno parte del "
@@ -472,13 +613,24 @@
 "software/tar/\">GNU tar</a>, e molto altro."
 
 # type: Content of: <ol><li>
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"nottools\"></a>For-]{+For+} instance, The Bourne Again SHell
+# | (BASH), the PostScript interpreter <a
+# | href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the
+# | <a href=\"/software/libc/libc.html\">GNU C library</a> are not programming
+# | tools.  Neither are GNUCash, GNOME, and GNU Chess.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\"></a>Per esempio la Bourne Again SHell (BASH), "
 "l'interprete PostScript <a href=\"/software/ghostscript/ghostscript.html"
@@ -487,23 +639,42 @@
 "GNUCash, GNOME e GNU Chess."
 
 # type: Content of: <ol><li>
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"somecomponents\"></a>For-]{+For+} instance, the <a
+# | href=\"/software/libc/libc.html\">GNU C library</a>.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\"></a>Per esempio la <a href=\"/software/libc/libc."
 "html\">libreria GNU C</a>."
 
 # type: Content of: <ol><li>
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"newersystems\"></a>Since-]{+Since+} that was written, a
+# | nearly-all-free Windows-like system has been developed, but technically it
+# | is not at all like GNU or Unix, so it doesn't really affect this issue. 
+# | Most of the kernel of Solaris has been made free, but if you wanted to
+# | make a free system out of that, aside from replacing the missing parts of
+# | the kernel, you would also need to put it into GNU or BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\"></a>E' stato poi sviluppato un sistema quasi libero "
 "simile a Windows, ma tecnicamente non &egrave; assolutamente come GNU o "
@@ -513,15 +684,31 @@
 "del kernel, ma bisognerebbe anche inserirlo nel sistema GNU o BSD."
 
 # type: Content of: <ol><li>
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"gnubsd\"></a>On-]{+On+} the other hand, in the years since this
+# | article was written, the GNU C Library has been ported to several versions
+# | of the BSD kernel, which made it straightforward to combine the GNU system
+# | with that kernel.  Just as with GNU/Linux, these are indeed variants of
+# | GNU, and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD
+# | depending on the kernel of the system.  Ordinary users on typical desktops
+# | can hardly distinguish between GNU/Linux and GNU/*BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
+#| "was written, the GNU C Library has been ported to several versions of the "
+#| "BSD kernel, which made it straightforward to combine the GNU system with "
+#| "that kernel.  Just as with GNU/Linux, these are indeed variants of GNU, "
+#| "and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD "
+#| "depending on the kernel of the system.  Ordinary users on typical "
+#| "desktops can hardly distinguish between GNU/Linux and GNU/*BSD."
+msgid ""
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a id=\"gnubsd\"></a>D'altra parte, col passare del tempo da quando &egrave; "
 "stato scritto questo articolo, la libreria GNU C &egrave; stata adattata "
@@ -580,8 +767,13 @@
 "traduzioni</a>."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+# | Copyright &copy; 1997-2002, [-2007, 2014-2017,-] {+2005, 2008,+} 2019,
+# | 2021 Richard [-M.-] Stallman
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. "
+#| "Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
 
@@ -609,3 +801,6 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Ultimo aggiornamento:"
+
+#~ msgid "Notes"
+#~ msgstr "Note"

Index: gnu/po/linux-and-gnu.ja.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ja.po,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- gnu/po/linux-and-gnu.ja.po  1 Jul 2021 02:03:47 -0000       1.60
+++ gnu/po/linux-and-gnu.ja.po  30 Aug 2021 13:34:54 -0000      1.61
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2019-06-25 16:55+0900\n"
 "Last-Translator: NIIBE Yutaka <gniibe@fsij.org>\n"
 "Language-Team: Japanese <web-translators-ja@gnu.org>\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 
 #. type: Content of: <title>
 msgid "Linux and GNU - GNU Project - Free Software Foundation"
@@ -39,28 +40,29 @@
 "ピュータの利用者が自らが使うソフトウェアをå…
±æœ‰ã—改良する自由を有するよう、活"
 "動しています。"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "LinuxとGNUシステム"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a 
href=\"https://www.stallman.org/\";>リチャード・ストールマン</a>著"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"さらに詳しい情報は<a 
href=\"/gnu/gnu-linux-faq.html\">GNU/LinuxのFAQ</a> と "
-"<a href=\"/gnu/why-gnu-linux.html\">なんでGNU/Linux?</a>もご覧くだ
さい。"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -74,6 +76,14 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"さらに詳しい情報は<a 
href=\"/gnu/gnu-linux-faq.html\">GNU/LinuxのFAQ</a> と "
+"<a href=\"/gnu/why-gnu-linux.html\">なんでGNU/Linux?</a>もご覧くだ
さい。"
+
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -94,10 +104,17 @@
 
"&ldquo;Linux&rdquo;ディストリビューションは、すべて、本当はGNU/Linuxのディス"
 "トリビューションなのです。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -108,7 +125,7 @@
 "ング・システムå…
¨ä½“ã‚’1991年に少しの助けとともに開発したと、しばしば考えていま"
 "す。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -126,7 +143,7 @@
 "Unixライクなシステムを作るのに必
要なものはすでにほぼすべてそろっていた、とい"
 "うようなことを多くは信じています。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free software</"
@@ -147,7 +164,7 @@
 "GNUシステム
の原案の一部が概説されています。Linuxが開始されるまでに、GNUはほぼ"
 "完成していたのです。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -164,18 +181,31 @@
 "ジェクトからのある特定のプログラム
によって、この種のプロジェクトの貢献を測る"
 "というのは自然なことです。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "If we tried to measure the GNU Project's contribution in this way, what "
+#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
+#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
+#| "\">GNU software</a> was the largest single contingent, around 28% of the "
+#| "total source code, and this included some of the essential major "
+#| "components without which there could be no system.  Linux itself was "
+#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
+#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
+#| "15%.)  So if you were going to pick a name for the system based on who "
+#| "wrote the programs in the system, the most appropriate single choice "
+#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 
"もし、わたしたちがこのようなやり方でGNUプロジェクトの貢献を測ろうとすると、ど"
 "ういう結論に至るでしょうか。あるCD-ROM販売業者
によると、かれらの「Linux ディ"
@@ -188,7 +218,7 @@
 "断基準でそのシステム
の名前を一つ選ぶということであれば、もっともふさわしい選"
 "択は&ldquo;GNU&rdquo;ということになるでしょう。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -206,7 +236,7 @@
 "ジェクトは、<em>完全な自由のUnixライクなシステム</em>: 
GNUを開発することを目"
 "標としたのです。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -234,7 +264,7 @@
 
"\"#nottools\">(2)</a>たくさんのコンポーネントもわたしたちは書きました。チェス"
 "のゲーム、GNU Chessも開発しました。完全なシステム
にはゲームも必要ですから。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -250,11 +280,20 @@
 "linux.html\">2001年にGNU 
Hurdは確かに動くようになりました</a>が、一般の使用に"
 "供するのに十分と言えるまでには、まだまだ
長い道のりがあります。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
+#| "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
+#| "system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+#| "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the "
+#| "GNU system</a> to make a complete free system &mdash; a version of the "
+#| "GNU system which also contained Linux.  The GNU/Linux system, in other "
+#| "words."
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -266,7 +305,7 @@
 "ムに組み合わせ</a>、完全なシステム
を作ることができるようになりました: Linuxも"
 "含んだGNUシステム
のバージョンです。別の言葉で言えば、GNU/Linuxシステム
です。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -289,11 +328,19 @@
 "は、ものごとの本質として、誰かによって必
ずなされなければならない仕事だったの"
 "です。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -304,7 +351,7 @@
 "GNU/Linuxシステム
では現在のライブラリのリリースを変更なしで利用するようになり"
 "ました。FSFは、また、Debian GNU/Linux 
の開発の初期段階に資金提供をしました。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Today there are many different variants of the GNU/Linux system (often "
 "called &ldquo;distros&rdquo;).  Most of them include nonfree programs&mdash;"
@@ -324,14 +371,23 @@
 
"GNU/Linuxディストロ</a>もあるのです。FSFは、こういったディストリビューション"
 "のいくつかにコンピュータ設備を提供しています。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Making a free GNU/Linux distribution is not just a matter of eliminating "
+#| "various nonfree programs.  Nowadays, the usual version of Linux contains "
+#| "nonfree programs too.  These programs are intended to be loaded into I/O "
+#| "devices when the system starts, and they are included, as long series of "
+#| "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/"
+#| "Linux distributions now entails maintaining a <a href=\"http://directory.";
+#| "fsf.org/project/linux\"> free version of Linux</a> too."
 msgid ""
 "Making a free GNU/Linux distribution is not just a matter of eliminating "
 "various nonfree programs.  Nowadays, the usual version of Linux contains "
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 
"自由なGNU/Linuxディストリビューションを作るのは単にさまざまな不自由なプログラ"
@@ -342,13 +398,20 @@
 "まや、<a 
href=\"http://directory.fsf.org/project/linux\";>自由な版のLinux</a>"
 "も保守することが必然的に伴うのです。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 
"GNU/Linuxを使うかどうかは別にして、どうか&ldquo;Linux&rdquo;という名称をあい"
 "まいに使うことで一般大衆を混乱させないでくだ
さい。Linuxはカーネルであり、シス"
@@ -356,13 +419,21 @@
 "ムであり、Linuxが追加
されたものなのです。この組み合わせについて語るときには、"
 "&ldquo;GNU/Linux&rdquo;と呼んでください。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "参照として、&ldquo;GNU/Linux&rdquo; 
についてリンクを張りたいときは、このペー"
 "ジとこちら<a href=\"/gnu/the-gnu-project.html\"> 
http://www.gnu.org/gnu/the-";
@@ -370,11 +441,11 @@
 "ンクを加えたいときには、<a 
href=\"http://foldoc.org/linux\";>http://foldoc.";
 "org/linux</a>が使うのに適したURLです。"
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr "あとがき"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Aside from GNU, one other project has independently produced a free Unix-"
 "like operating system.  This system is known as BSD, and it was developed at "
@@ -390,7 +461,7 @@
 "href=\"#newersystems\">(4)</a>はGNUシステムの変種か、BSDシステム
の一種と考え"
 "てまず間違いありません。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -412,51 +483,74 @@
 
"ん。ですから、GNU/BSDというような名前は状況に則したものではないでしょう。<a
 "
 "href=\"#gnubsd\">(5)</a>"
 
-#. type: Content of: <div><div><h3>
-msgid "Notes"
-msgstr "注"
-
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+#. type: Content of: <div><h3>
+msgid "Footnotes"
+msgstr "脚注"
+
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"unexciting\"></a>These unexciting but essential components "
+#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
+#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
+#| "\"/software/tar/\">GNU tar</a>, and many more."
+msgid ""
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a 
id=\"unexciting\"></a>エキサイティングではないが重要なコンポーネントには、"
 "GNUアセンブラ(GAS)、リンカー(GLD) (両方とも今は<a 
href=\"/software/binutils/"
 "\">GNU Binutils</a>パッケージに入っています)、<a 
href=\"/software/tar/\">GNU "
 "tar</a>、などを含め、たくさんのものが含まれます。"
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\"></a>たとえば、Bourne Again SHell 
(BASH)、PostScriptインタ"
 "プリタ<a 
href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>、<a "
 "href=\"/software/libc/libc.html\">GNU 
Cライブラリ</a>はプログラミング・ツール"
 "ではありません。GNUCash、GNOME、GNU 
Chessもそうではありません。"
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\"></a>たとえば、<a 
href=\"/software/libc/libc.html"
 "\">GNU Cライブラリ</a>です。"
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\"></a>これが書かれてから、だいたいå…
¨éƒ¨ãŒè‡ªç”±ãªã‚¦ã‚£ãƒ³ãƒ‰ã‚¦"
 "ズライクなシステム
が開発されましたが、技術的にはこれはまったくGNUあるいはUnix"
@@ -465,15 +559,24 @@
 
"の足りない部分を置き換えるほかに、これもまた、GNUかBSDに載せるå¿
…要があるで"
 "しょう。"
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
+#| "was written, the GNU C Library has been ported to several versions of the "
+#| "BSD kernel, which made it straightforward to combine the GNU system with "
+#| "that kernel.  Just as with GNU/Linux, these are indeed variants of GNU, "
+#| "and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD "
+#| "depending on the kernel of the system.  Ordinary users on typical "
+#| "desktops can hardly distinguish between GNU/Linux and GNU/*BSD."
+msgid ""
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a 
id=\"gnubsd\"></a>一方、この論説が書かれて何年かたった後、GNU
 Cライブラリ"
 
"は、BSDカーネルのいくつかの版に移植されました。これにより、GNUシステãƒ
 ã‚’BSDの"
@@ -524,8 +627,11 @@
 "README.translations.html\">翻訳 README</a>をご覧ください。"
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. "
+#| "Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
 
@@ -549,6 +655,9 @@
 msgid "Updated:"
 msgstr "最終更新:"
 
+#~ msgid "Notes"
+#~ msgstr "注"
+
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"

Index: gnu/po/linux-and-gnu.ko.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ko.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- gnu/po/linux-and-gnu.ko.po  7 Apr 2021 18:04:05 -0000       1.5
+++ gnu/po/linux-and-gnu.ko.po  30 Aug 2021 13:34:54 -0000      1.6
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+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"
@@ -39,33 +39,27 @@
 "해 주기 위해서, 1983년부터 자유 유닉스 형태의 운영체ì 
œì¸ GNU를 개발해 왔습니"
 "다."
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "리눅스와 GNU 시스템"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 # | by <a href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a>
 #, fuzzy
 #| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "글: <a href=\"http://www.stallman.org/\";>리처드 스톨먼</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Many computer users run a modified version of <a
 # | href=\"/philosophy/categories.html#TheGNUsystem\">the GNU system</a> every
 # | day, without realizing it.  Through a peculiar turn of events, the version
-# | of GNU which is widely used today is [-more-] often [-known as-]
-# | {+called+} &ldquo;Linux&rdquo;, and many {+of its+} users are {+<a
-# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">+} not [-aware of-]
-# | {+aware</a> that it is basically+} the [-extent of its connection with-]
-# | {+GNU system, developed by+} the <a href=\"/gnu/gnu-history.html\">GNU
-# | Project</a>.
+# | of GNU which is widely used today is [-more-] often [-known as
+# | &ldquo;Linux&rdquo;,-] {+called &ldquo;Linux,&rdquo;+} and many {+of its+}
+# | users are {+<a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">+} not
+# | [-aware of-] {+aware</a> that it is basically+} the [-extent of its
+# | connection with-] {+GNU system, developed by+} the <a
+# | href=\"/gnu/gnu-history.html\">GNU Project</a>.
 #, fuzzy
 #| msgid ""
 #| "Many computer users run a modified version of <a href=\"/philosophy/"
@@ -78,7 +72,7 @@
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -90,6 +84,12 @@
 "로젝트</a>와의 관계에 대해서 잘 알고 있는 사람은 많지 
않은 것 같습니다."
 
 #. type: Content of: <div><div><p>
+msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
 # | There really is a [-Linux; it is a kernel,-] {+Linux,+} and these people
 # | are using [-it.  But you can't use-] {+it, but it is just+} a {+part of
 # | the system they use.  Linux is the kernel: the program in the system that
@@ -125,13 +125,14 @@
 "운영체제이며 이는 리눅스를 커널로 채택한 일종의 
변형된 종류의 GNU 시스템이라"
 "고 할 수 있습니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Many users [-are-] {+do+} not [-fully aware of-] {+understand+} the
 # | [-distinction-] {+difference+} between the kernel, which is Linux, and the
-# | whole system, which they also call &ldquo;Linux&rdquo;.  The ambiguous use
-# | of the name doesn't [-promote understanding.-] {+help people understand. 
-# | These users often think that Linus Torvalds developed the whole operating
-# | system in 1991, with a bit of help.+}
+# | whole system, which they also call [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} The ambiguous use of the name doesn't [-promote
+# | understanding.-] {+help people understand.  These users often think that
+# | Linus Torvalds developed the whole operating system in 1991, with a bit of
+# | help.+}
 #, fuzzy
 #| msgid ""
 #| "Many users are not fully aware of the distinction between the kernel, "
@@ -140,7 +141,7 @@
 #| "understanding."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -149,7 +150,7 @@
 "의미하는 명칭으로서의 리눅스를 혼동해서 사용함으로써 
그 차이를 명확하게 구분"
 "하지 못하게 할 수도 있을 것입니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Programmers generally know that Linux is a kernel.  But since they have
 # | generally heard the whole system called &ldquo;Linux&rdquo; as well, they
 # | often envisage a history [-which fits-] that [-name.-] {+would justify
@@ -184,7 +185,7 @@
 "추기에 충분한 자유소프트웨어들을 우연찮게 발견했기 
때문에 운영체제의 이름을 "
 "그 발단이 되는 리눅스라고 하지 않았겠는가 하는 식으로 
말입니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | What they found was no accident&mdash;it was the {+not-quite-complete+}
 # | GNU system.  The available <a href=\"/philosophy/free-sw.html\">free
 # | software</a> added up to a complete system because the GNU Project had
@@ -221,7 +222,7 @@
 "써 시작한 우리의 과업을 그후 10년 이상동안 꾸준히 
수행해 온 결과였기 때문입니"
 "다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Most free software projects have the goal of developing a particular
 # | program for a particular job.  For example, Linus Torvalds set out to
 # | write a Unix-like kernel (Linux); Donald Knuth set out to write a text
@@ -254,10 +255,10 @@
 "럼 특정한 프로그램이 갖고 있는 비중에 따라서 그 
이름으로 전체를 대표한다는 것"
 "은 무척이나 자연스러운 발상인 것입니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | If we tried to measure the GNU Project's contribution in this way, what
 # | would we conclude? One CD-ROM vendor found that in their &ldquo;Linux
-# | distribution&rdquo;, <a
+# | [-distribution&rdquo;,-] {+distribution,&rdquo;+} <a
 # | href=\"/philosophy/categories.html#GNUsoftware\">GNU software</a> was the
 # | largest single contingent, around 28% of the total source code, and this
 # | included some of the essential major components without which there could
@@ -265,7 +266,7 @@
 # | similar: in the &ldquo;main&rdquo; repository of gNewSense, Linux is 1.5%
 # | and GNU packages are 15%.)+}  So if you were going to pick a name for the
 # | system based on who wrote the programs in the system, the most appropriate
-# | single choice would be &ldquo;GNU&rdquo;.
+# | single choice would be [-&ldquo;GNU&rdquo;.-] {+&ldquo;GNU.&rdquo;+}
 #, fuzzy
 #| msgid ""
 #| "If we tried to measure the GNU Project's contribution in this way, what "
@@ -280,14 +281,14 @@
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "그러나 만일, GNU 프로젝트가 특정한 프로그램을 개발하기 
위한 프로젝트였고 위"
 "와 같은 방식으로운영체제의 이름을 명명하게 된다면 
과연 어떤 결과가 되어야 할"
@@ -298,7 +299,7 @@
 "함되어 있습니다. 따라서 운영체제를 구성하는 
프로그램의 비중에 따라서 그 이름"
 "을 짓는다면 가장 타당한 이름은 리눅스가 아닌 “GNU”가 
되어야 할 것입니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | But [-we don't think-] that is {+not+} the [-right-] {+deepest+} way to
 # | consider the question.  The GNU Project was not, is not, a project to
 # | develop specific software packages.  It was not a project {+<a
@@ -331,7 +332,7 @@
 "트의 목표는 유닉스 형태의 완벽한 운영체제를 개발하기 
위한 것이며 이는 우리가 "
 "많은 사람들의 도움을 통해서 지금까지 수행해 온 사업의 
핵심입니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Many people have made major contributions to the free software in the
 # | system, and they all deserve [-credit.-] {+credit for their software.+} 
 # | But the reason it is [-<em>a-] {+<em>an integrated+} system</em>&mdash;and
@@ -389,7 +390,7 @@
 "<a href=\"/software/ghostscript/ghostscript.html\">ê³ 
스트스크립트</a>와 본셸"
 "(Bourne Again SHell) 등도 만들었습니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | By the early 90s we had put together the whole system aside from the
 # | [-kernel (and we were-] {+kernel.  We had+} also [-working on-]
 # | {+started+} a kernel, the <a href=\"/software/hurd/hurd.html\">GNU
@@ -419,13 +420,13 @@
 "html\">GNU Hurd</a>는 개발 중에 있었습니다. GNU HURD의 개발은 
아직도 <a href="
 "\"/software/hurd/hurd-and-linux.html\">진행 중인 상태</a>에 
있습니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Fortunately, [-you don't-] {+we didn't+} have to wait for [-it,-] {+the
 # | Hurd,+} because [-Linux is working now.  When Linus-] {+of Linux.  Once+}
 # | Torvalds [-wrote Linux, he filled-] {+freed Linux in 1992, it fit into+}
 # | the last major [-gap.-] {+gap in the GNU system.+}  People could then <a
 # | 
[-href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>put-]
-# | 
{+href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>
+# | 
{+href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>
 # | combine+} Linux [-together-] with the GNU system</a> to make a complete
 # | free [-system:-] {+system &mdash;+} a [-Linux-based-] {+version of the+}
 # | GNU system [-(or-] {+which also contained Linux.  The+} GNU/Linux system,
@@ -441,7 +442,7 @@
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -452,7 +453,7 @@
 "RELNOTES-0.01\">GNU 시스템에 합류함으로써 마침내</a> 
완성된형태의 운영체제를 "
 "만들 수 있게 되었습니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | [-Putting-]{+Making+} them {+work well+} together [-sounds simple, but
 # | it-] was not a trivial job.  [-The <a
 # | href=\"/software/libc/libc.html\">GNU C library</a> (called glibc for
@@ -495,10 +496,10 @@
 "의 구성을 위해서 노력했던 많은 사람들의 수고 덕분에, 
결국 리눅스와 이에 맞게 "
 "수정된 GNU 시스템은 완성된 운영체제로서의 모습을 갖출 
수 있게 되었습니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU
 # | [-system&mdash;even with funds.  We-] {+system.  The <a
-# | href=\"http://fsf.org/\";>FSF</a>+} funded the rewriting of the
+# | href=\"https://fsf.org/\";>FSF</a>+} funded the rewriting of the
 # | Linux-related extensions to the GNU C library, so that now they are well
 # | integrated, and the newest GNU/Linux systems use the current library
 # | release with no changes.  [-We-]  {+The FSF+} also funded an early stage
@@ -513,8 +514,8 @@
 #| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -527,7 +528,7 @@
 "반의 GNU 시스템인 데비안 GNU/Linux의 개발 초기 단계에서 
이를 지원하기 위한 기"
 "금을 이안 멀독(Ian Murdock)에게 제공하기도 했습니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Today there are many different variants of the GNU/Linux system (often "
 "called &ldquo;distros&rdquo;).  Most of them include nonfree programs&mdash;"
@@ -539,25 +540,25 @@
 "FSF supports computer facilities for a few of them."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making a free GNU/Linux distribution is not just a matter of eliminating "
 "various nonfree programs.  Nowadays, the usual version of Linux contains "
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | [-We use Linux-based GNU systems today for most of our work, and we
 # | hope-]{+Whether+} you use [-them too.  But-] {+GNU/Linux or not,+} please
 # | don't confuse the public by using the name &ldquo;Linux&rdquo;
 # | ambiguously.  Linux is the kernel, one of the essential major components
 # | of the system.  The system as a whole is [-more or less-] {+basically+}
 # | the GNU [-system.-] {+system, with Linux added.  When you're talking about
-# | this combination, please call it &ldquo;GNU/Linux&rdquo;.+}
+# | this combination, please call it &ldquo;GNU/Linux.&rdquo;+}
 #, fuzzy
 #| msgid ""
 #| "We use Linux-based GNU systems today for most of our work, and we hope "
@@ -570,7 +571,7 @@
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "현재, 우리는 대부분의 작업에 리눅스 기반의 GNU 시스템을 
이용하고 있으며 이 시"
 "스템의 사용을 많은 사람들 에게 권장하고 있습니다. 
그러나 리눅스를 커널과 운영"
@@ -578,20 +579,20 @@
 "리눅스라는 이름을, 운영체제 전체를 지칭할 때는 GNU라는 
명칭을 사용해 줄 것을 "
 "간곡하게 당부하고 싶습니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Aside from GNU, one other project has independently produced a free
 # | Unix-like operating system.  This system is known as BSD, and it was
 # | developed at UC Berkeley.  [-The BSD developers were inspired to make
@@ -632,7 +633,7 @@
 "에 오늘날의 자유 운영체제는 크게 GNU 시스템과 BSD 시스템 
두개의 영역으로 구분"
 "할 수 있습니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -645,52 +646,50 @@
 "\"#gnubsd\">(5)</a>"
 msgstr ""
 
-#. type: Content of: <div><div><h3>
-msgid "Notes"
-msgstr ""
+#. type: Content of: <div><h3>
+msgid "Footnotes"
+msgstr "각주"
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -740,8 +739,7 @@
 
 #. type: Content of: <div><p>
 #, fuzzy
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr "Copyright &copy; 1997, 1998, 1999 Richard M. Stallman"
 
 #. type: Content of: <div><p>

Index: gnu/po/linux-and-gnu.lt-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.lt-diff.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gnu/po/linux-and-gnu.lt-diff.html   30 May 2021 19:32:26 -0000      1.9
+++ gnu/po/linux-and-gnu.lt-diff.html   30 Aug 2021 13:34:54 -0000      1.10
@@ -10,44 +10,49 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.79</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.79</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;Linux and GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU 
HURD, Hurd" /&gt;
 &lt;meta http-equiv="Description" content="Since 1983, developing the free 
Unix style operating system GNU, so that computer users can have the freedom to 
share and improve the software they use." /&gt;
 &lt;!--#include virtual="/gnu/po/linux-and-gnu.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;Linux</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;Linux</em></ins></span> 
and the GNU System&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;Linux and the GNU System&lt;/h2&gt;
 
-<span 
class="removed"><del><strong>&lt;p&gt;&lt;strong&gt;by</strong></del></span>
+<span class="removed"><del><strong>&lt;p&gt;&lt;strong&gt;by &lt;a 
href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;address class="byline 
c"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
-<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;
-
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;For</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;For</em></ins></span> more 
information see also
-the &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;,
+  &lt;blockquote&gt;&lt;p&gt;For more information see also
+the</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;address 
class="byline"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux 
FAQ&lt;/a&gt;,
 and &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;&lt;/p&gt;
-  <span class="removed"><del><strong>&lt;/blockquote&gt;</strong></del></span>
-&lt;/div&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;
+  &lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;
 Many computer users run a modified version of
 &lt;a href="/philosophy/categories.html#TheGNUsystem"&gt;the GNU 
system&lt;/a&gt;
 every day, without realizing it.  Through a peculiar turn of events,
 the version of GNU which is widely used today is often called
-&ldquo;Linux&rdquo;, and many of its users
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> and 
many of its users
 are &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt; not aware&lt;/a&gt;
 that it is basically the GNU system, developed by the
 &lt;a href="/gnu/gnu-history.html"&gt;GNU Project&lt;/a&gt;.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;div class="announcement comment" 
role="complementary"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;p&gt;For more information see also
+the &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;,
+and &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;</em></ins></span>
+
 &lt;p&gt;
 There really is a Linux, and these people are using it, but it is just
 a part of the system they use.  Linux is the kernel: the program in
@@ -63,7 +68,8 @@
 &lt;p&gt;
 Many users do not understand the difference between the kernel, which
 is Linux, and the whole system, which they also call
-&ldquo;Linux&rdquo;.  The ambiguous use of the name doesn't help
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  The 
ambiguous use of the name doesn't help
 people understand.  These users often think that Linus Torvalds
 developed the whole operating system in 1991, with a bit of help.&lt;/p&gt;
 
@@ -100,7 +106,8 @@
 &lt;p&gt;
 If we tried to measure the GNU Project's contribution in this way,
 what would we conclude?  One CD-ROM vendor found that in their &ldquo;Linux
-distribution&rdquo;, &lt;a 
href="/philosophy/categories.html#GNUsoftware"&gt;GNU
+<span class="removed"><del><strong>distribution&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>distribution,&rdquo;</em></ins></span> &lt;a 
href="/philosophy/categories.html#GNUsoftware"&gt;GNU
 software&lt;/a&gt; was the largest single contingent, around 28% of the
 total source code, and this included some of the essential major
 components without which there could be no system.  Linux itself was
@@ -108,7 +115,7 @@
 repository of gNewSense, Linux is 1.5% and GNU packages are 15%.)
 So if you were going to pick a name for the system based on
 who wrote the programs in the system, the most appropriate single
-choice would be &ldquo;GNU&rdquo;.&lt;/p&gt;
+choice would be <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU.&rdquo;&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
 But that is not the deepest way to consider the question.  The GNU
@@ -147,7 +154,7 @@
 Fortunately, we didn't have to wait for the Hurd, because of Linux.
 Once Torvalds freed Linux in 1992, it fit into the last major gap in
 the GNU system.  People could
-then &lt;a 
href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+then &lt;a <span 
class="removed"><del><strong>href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
 combine Linux with the GNU system&lt;/a&gt; to make a complete free system
 &mdash; a version of the GNU system which also contained Linux.  The
 GNU/Linux system, in other words.&lt;/p&gt;
@@ -165,7 +172,7 @@
 
 &lt;p&gt;
 The GNU Project supports GNU/Linux systems as well as &lt;em&gt;the&lt;/em&gt; 
GNU
-system.  The &lt;a href="http://fsf.org/"&gt;FSF&lt;/a&gt; funded the 
rewriting of
+system.  The &lt;a <span 
class="removed"><del><strong>href="http://fsf.org/"&gt;FSF&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://fsf.org/"&gt;FSF&lt;/a&gt;</em></ins></span>
 funded the rewriting of
 the Linux-related extensions to the GNU C library, so that now they
 are well integrated, and the newest GNU/Linux systems use the current
 library release with no changes.  The FSF also funded an early stage
@@ -189,7 +196,7 @@
 be loaded into I/O devices when the system starts, and they are
 included, as long series of numbers, in the "source code" of Linux.
 Thus, maintaining free GNU/Linux distributions now entails maintaining
-a &lt;a href="http://directory.fsf.org/project/linux"&gt; free version of
+a &lt;a <span 
class="removed"><del><strong>href="http://directory.fsf.org/project/linux"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://directory.fsf.org/project/linux"&gt;</em></ins></span>
 free version of
 Linux&lt;/a&gt; too.&lt;/p&gt;
 
 &lt;p&gt;Whether you use GNU/Linux or not, please don't confuse the public
@@ -197,14 +204,16 @@
 kernel, one of the essential major components of the system.  The
 system as a whole is basically the GNU system, with Linux added.  When
 you're talking about this combination, please call it
-&ldquo;GNU/Linux&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.&lt;/p&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
 If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
 reference, this page and &lt;a href="/gnu/the-gnu-project.html"&gt;
-http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt; are good choices.  If
+<span 
class="removed"><del><strong>http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>https://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</em></ins></span>
 are good choices.  If
 you mention Linux, the kernel, and want to add a link for further
-reference, &lt;a 
href="http://foldoc.org/linux"&gt;http://foldoc.org/linux&lt;/a&gt; 
+reference, &lt;a <span 
class="removed"><del><strong>href="http://foldoc.org/linux"&gt;http://foldoc.org/linux&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://foldoc.org/linux"&gt;https://foldoc.org/linux&lt;/a&gt;</em></ins></span>
 
 is a good URL to use.&lt;/p&gt;
 
 <span 
class="removed"><del><strong>&lt;h3&gt;Postscripts&lt;/h3&gt;</strong></del></span>
@@ -235,35 +244,44 @@
 <span 
class="removed"><del><strong>&lt;h3&gt;Notes:&lt;/h3&gt;</strong></del></span>
 <span class="inserted"><ins><em>&lt;div class="column-limit"&gt;&lt;/div&gt;
 
-&lt;h3 class="footnote"&gt;Notes&lt;/h3&gt;</em></ins></span>
+&lt;h3 class="footnote"&gt;Footnotes&lt;/h3&gt;</em></ins></span>
 &lt;ol&gt;
-&lt;li&gt;
-&lt;a id="unexciting"&gt;&lt;/a&gt;These unexciting but essential components
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="unexciting"&gt;&lt;/a&gt;These</strong></del></span>
+<span class="inserted"><ins><em>&lt;li 
id="unexciting"&gt;These</em></ins></span> unexciting but essential components
 include the GNU assembler (GAS) and the linker (GLD), both
 are now part of the &lt;a href="/software/binutils/"&gt;GNU Binutils&lt;/a&gt;
 package, &lt;a href="/software/tar/"&gt;GNU tar&lt;/a&gt;, and many 
more.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="nottools"&gt;&lt;/a&gt;For instance, The Bourne Again SHell (BASH),
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="nottools"&gt;&lt;/a&gt;For</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li id="nottools"&gt;For</em></ins></span> 
instance, The Bourne Again SHell (BASH),
 the PostScript interpreter
 &lt;a href="/software/ghostscript/ghostscript.html"&gt;Ghostscript&lt;/a&gt;, 
and the
 &lt;a href="/software/libc/libc.html"&gt;GNU C library&lt;/a&gt; are not
 programming tools.  Neither are GNUCash, GNOME, and GNU Chess.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="somecomponents"&gt;&lt;/a&gt;For instance, the
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="somecomponents"&gt;&lt;/a&gt;For</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li 
id="somecomponents"&gt;For</em></ins></span> instance, the
 &lt;a href="/software/libc/libc.html"&gt;GNU C library&lt;/a&gt;.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="newersystems"&gt;&lt;/a&gt;Since that was written, a nearly-all-free
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="newersystems"&gt;&lt;/a&gt;Since</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li 
id="newersystems"&gt;Since</em></ins></span> that was written, a nearly-all-free
 Windows-like system has been developed, but technically it is not at
 all like GNU or Unix, so it doesn't really affect this issue.  Most of
 the kernel of Solaris has been made free, but if you wanted to make a
 free system out of that, aside from replacing the missing parts of the
 kernel, you would also need to put it into GNU or BSD.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="gnubsd"&gt;&lt;/a&gt;On the other hand, in the years since this 
article
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="gnubsd"&gt;&lt;/a&gt;On</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li id="gnubsd"&gt;On</em></ins></span> the 
other hand, in the years since this article
 was written, the GNU C Library has been ported to several versions of
 the BSD kernel, which made it straightforward to combine the GNU system
 with that kernel.  Just as with GNU/Linux, these are indeed variants of
@@ -271,10 +289,8 @@
 GNU/kNetBSD depending on the kernel of the system.  Ordinary users on
 typical desktops can hardly distinguish between GNU/Linux and
 GNU/*BSD.&lt;/li&gt;
-
 &lt;/ol&gt;
-<span class="inserted"><ins><em>&lt;/div&gt;
-&lt;/div&gt;</em></ins></span>
+<span class="inserted"><ins><em>&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;
@@ -323,7 +339,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; <span class="removed"><del><strong>1997, 1998, 1999, 
2000, 2001, 2002,</strong></del></span> <span 
class="inserted"><ins><em>1997-2002,</em></ins></span> 2007, <span 
class="removed"><del><strong>2014, 2015, 2016, 2017</strong></del></span> <span 
class="inserted"><ins><em>2014-2017, 2019, 2021</em></ins></span> Richard M. 
Stallman&lt;/p&gt;
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>1997, 1998, 1999, 
2000, 2001, 2002,
+2007, 2014, 2015, 2016, 2017</strong></del></span> <span 
class="inserted"><ins><em>1997-2002, 2005, 2008, 2019, 2021</em></ins></span> 
Richard <span class="removed"><del><strong>M.</strong></del></span> 
Stallman&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
@@ -333,11 +350,12 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/05/30 19:32:26 $
+$Date: 2021/08/30 13:34:54 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-&lt;/div&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for class="inner", starts 
in the banner include --&gt;</em></ins></span>
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>

Index: gnu/po/linux-and-gnu.lt.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.lt.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gnu/po/linux-and-gnu.lt.po  30 May 2021 19:32:26 -0000      1.12
+++ gnu/po/linux-and-gnu.lt.po  30 Aug 2021 13:34:54 -0000      1.13
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2016-01-16 21:48+0200\n"
 "Last-Translator: Donatas Klimašauskas <klimasauskas.d@gmail.com>\n"
 "Language-Team: Lithuanian <web-translators@gnu.org>\n"
@@ -40,11 +40,11 @@
 "kompiuterio naudotojai gali turėti laisvę dalintis ir pagerinti jų 
naudojamą "
 "programinę įrangą."
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "Linux ir GNU sistema"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 # | by <a [-href=\"http://www.stallman.org/\";><strong>Richard
 # | Stallman</strong></a>-] {+href=\"https://www.stallman.org/\";>Richard
 # | Stallman</a>+}
@@ -57,21 +57,29 @@
 "pagal <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</"
 "strong></a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"Daugiau informacijos taip pat pamatykite <a href=\"/gnu/gnu-linux-faq.html"
-"\">GNU/Linux DUK</a> ir <a href=\"/gnu/why-gnu-linux.html\">Kodėl GNU/Linux?"
-"</a>"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many computer users run a modified version of <a
+# | href=\"/philosophy/categories.html#TheGNUsystem\">the GNU system</a> every
+# | day, without realizing it.  Through a peculiar turn of events, the version
+# | of GNU which is widely used today is often called [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and many of its users are <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> that it is
+# | basically the GNU system, developed by the <a
+# | href=\"/gnu/gnu-history.html\">GNU Project</a>.
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -86,6 +94,15 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"Daugiau informacijos taip pat pamatykite <a href=\"/gnu/gnu-linux-faq.html"
+"\">GNU/Linux DUK</a> ir <a href=\"/gnu/why-gnu-linux.html\">Kodėl GNU/Linux?"
+"</a>"
+
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -106,10 +123,22 @@
 "taip vadinamos &bdquo;Linux&ldquo; distribucijos iš tikrųjų yra GNU/Linux "
 "distribucijos."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many users do not understand the difference between the kernel, which is
+# | Linux, and the whole system, which they also call [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} The ambiguous use of the name doesn't help people
+# | understand.  These users often think that Linus Torvalds developed the
+# | whole operating system in 1991, with a bit of help.
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -120,7 +149,7 @@
 "galvoja, kad Linus Torvalds, su trupučiu pagalbos, 1991&nbsp;m. išvystė tą
 "
 "visą operacinę sistemą."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -139,7 +168,7 @@
 "priežasties) beveik viskas būtina padaryti panašią į Unix sistemą jau 
buvo "
 "prieinama."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free software</"
@@ -159,7 +188,7 @@
 "\">Pradinis paskelbimas</a> taip pat apibrėžia kai kuriuos pradinius planus 
"
 "GNU sistemai.  Kai Linux buvo pradėtas, GNU buvo beveik užbaigta."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -175,18 +204,42 @@
 "System).  Natūralu tokio tipo projekto prisidėjimą matuoti specifinėmis "
 "programomis, kurios atkeliavo iš to projekto."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If we tried to measure the GNU Project's contribution in this way, what
+# | would we conclude? One CD-ROM vendor found that in their &ldquo;Linux
+# | [-distribution&rdquo;,-] {+distribution,&rdquo;+} <a
+# | href=\"/philosophy/categories.html#GNUsoftware\">GNU software</a> was the
+# | largest single contingent, around 28% of the total source code, and this
+# | included some of the essential major components without which there could
+# | be no system.  Linux itself was about 3%.  (The proportions in 2008 are
+# | similar: in the &ldquo;main&rdquo; repository of gNewSense, Linux is 1.5%
+# | and GNU packages are 15%.)  So if you were going to pick a name for the
+# | system based on who wrote the programs in the system, the most appropriate
+# | single choice would be [-&ldquo;GNU&rdquo;.-] {+&ldquo;GNU.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "If we tried to measure the GNU Project's contribution in this way, what "
+#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
+#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
+#| "\">GNU software</a> was the largest single contingent, around 28% of the "
+#| "total source code, and this included some of the essential major "
+#| "components without which there could be no system.  Linux itself was "
+#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
+#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
+#| "15%.)  So if you were going to pick a name for the system based on who "
+#| "wrote the programs in the system, the most appropriate single choice "
+#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "Jei mes pabandytume išmatuoti GNU projekto prisidėjimą šiuo būdu, kokią 
"
 "išvadą mes padarytume? Vieni CD-ROM pardavėjai išsiaiškino, kad jų 
&bdquo;"
@@ -200,7 +253,7 @@
 "sistemai, remdamiesi tuo, kas toje sistemoje parašė programas, pats "
 "tinkamiausias, vienintelis pasirinkimas būtų &bdquo;GNU&ldquo;."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -216,7 +269,7 @@
 "redaktorių, nors mes vieną išvystėme.  GNU projektas užsibrėžė 
išvystyti "
 "<em>išbaigtą, laisvą, panašią į Unix sistemą</em>: GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -244,7 +297,7 @@
 "nėra įrankiai<a href=\"#nottools\">(2)</a>.  Mes net išvystėme šachmatų 
"
 "žaidimą &ndash; GNU šachmatai, nes išbaigtai sistemai žaidimų reikia 
irgi."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -261,11 +314,27 @@
 "2001&nbsp;m.</a>, bet bendrai jis yra dar toli iki buvimo paruoštu žmonėms 
"
 "naudoti."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once
+# | Torvalds freed Linux in 1992, it fit into the last major gap in the GNU
+# | system.  People could then <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | combine Linux with the GNU system</a> to make a complete free system
+# | &mdash; a version of the GNU system which also contained Linux.  The
+# | GNU/Linux system, in other words.
+#, fuzzy
+#| msgid ""
+#| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
+#| "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
+#| "system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+#| "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the "
+#| "GNU system</a> to make a complete free system &mdash; a version of the "
+#| "GNU system which also contained Linux.  The GNU/Linux system, in other "
+#| "words."
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -277,7 +346,7 @@
 "laisvos sistemos &ndash; GNU sistemos versijos, kuri taip pat turėjo Linux, "
 "padarymui.  Kitais žodžiais, GNU/Linux sistema."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -298,11 +367,25 @@
 "kurie išvystė įvairias sistemos distribucijas atliko daug esminio darbo.  "
 "Bet tai buvo darbas, kurį, natūraliai, kažkas tikrai būtų atlikęs."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU
+# | system.  The <a href=\"http{+s+}://fsf.org/\">FSF</a> funded the rewriting
+# | of the Linux-related extensions to the GNU C library, so that now they are
+# | well integrated, and the newest GNU/Linux systems use the current library
+# | release with no changes.  The FSF also funded an early stage of the
+# | development of Debian GNU/Linux.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -314,7 +397,7 @@
 "jokių pakeitimų.  FSF taip pat finansavo ankstyvą Debian GNU/Linux vystymo 
"
 "stadiją."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Today there are many different variants of the GNU/Linux system (often
 # | called &ldquo;distros&rdquo;).  Most of them include [-non-free
 # | software&mdash;their-] {+nonfree programs&mdash;their+} developers follow
@@ -353,15 +436,15 @@
 "\"/distros/\">visiškai laisvos GNU/Linux distribucijos</a>.  FSF palaiko <a "
 "href=\"http://gnewsense.org/\";>gNewSense</a> kompiuterinius įrenginius."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Making a free GNU/Linux distribution is not just a matter of eliminating
 # | various non[---]free programs.  Nowadays, the usual version of Linux
 # | contains non[---]free programs too.  These programs are intended to be
 # | loaded into I/O devices when the system starts, and they are included, as
 # | long series of numbers, in the \"source code\" of Linux.  Thus,
 # | maintaining free GNU/Linux distributions now entails maintaining a <a
-# | href=\"http://directory.fsf.org/project/linux\";> free version of Linux</a>
-# | too.
+# | href=\"http{+s+}://directory.fsf.org/project/linux\"> free version of
+# | Linux</a> too.
 #, fuzzy
 #| msgid ""
 #| "Making a free GNU/Linux distribution is not just a matter of eliminating "
@@ -377,7 +460,7 @@
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 "Laisvos GNU/Linux distribucijos padarymas nėra tik įvairių, nelaisvų "
@@ -388,13 +471,26 @@
 "distribucijų palaikymas dabar apima <a href=\"http://directory.fsf.org/";
 "project/linux\">laisvos Linux versijos</a> palaikymą irgi."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Whether you use GNU/Linux or not, please don't confuse the public by using
+# | the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the
+# | essential major components of the system.  The system as a whole is
+# | basically the GNU system, with Linux added.  When you're talking about
+# | this combination, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Ar jūs naudojate GNU/Linux, ar ne, prašome nepainiokite publikos naudodami "
 "pavadinimą &bdquo;Linux&ldquo; dviprasmiškai.  Linux yra branduolys, vienas 
"
@@ -402,13 +498,29 @@
 "esmės yra GNU sistema, su pridėtu Linux.  Kai jūs kalbate apie šią "
 "kombinaciją, prašome ją vadinkite &bdquo;GNU/Linux&ldquo;."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
+# | reference, this page and <a href=\"/gnu/the-gnu-project.html\">
+# | http{+s+}://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
+# | you mention Linux, the kernel, and want to add a link for further
+# | reference, <a
+# | [-href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a>-]
+# | {+href=\"https://foldoc.org/linux\";>https://foldoc.org/linux</a>+} is a
+# | good URL to use.
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "Jei jūs norite padaryti nuorodą apie &bdquo;GNU/Linux&ldquo; tolimesniam "
 "nukreipimui, Å¡is puslapis ir <a href=\"/gnu/the-gnu-project.html\">http://";
@@ -417,11 +529,11 @@
 "nukreipimui, <a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> "
 "yra geras URL naudoti."
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr "Prierašai"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Aside from GNU, one other project has independently produced a free
 # | Unix-like operating system.  This system is known as BSD, and it was
 # | developed at UC Berkeley.  It was non[---]free in the 80s, but became free
@@ -451,7 +563,7 @@
 "sistema, kuri egzistuoja Å¡iandien<a href=\"#newersystems\">(4)</a> beveik "
 "užtikrintai yra arba GNU sistemos variantas, arba BSD sistemos tipas."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -473,54 +585,94 @@
 "ir nepridėjo jo prie GNU sistemos, ir pavadinimas, toks kaip GNU/BSD, šiai "
 "situacijai netiktų.<a href=\"#gnubsd\">(5)</a>"
 
-#. type: Content of: <div><div><h3>
-# | Notes[-:-]
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Footnotes"
+msgid "Footnotes"
+msgstr "Pastabos"
+
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"unexciting\"></a>These-]{+These+} unexciting but essential
+# | components include the GNU assembler (GAS) and the linker (GLD), both are
+# | now part of the <a href=\"/software/binutils/\">GNU Binutils</a> package,
+# | <a href=\"/software/tar/\">GNU tar</a>, and many more.
 #, fuzzy
-#| msgid "Notes:"
-msgid "Notes"
-msgstr "Pastabos:"
-
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+#| msgid ""
+#| "<a id=\"unexciting\"></a>These unexciting but essential components "
+#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
+#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
+#| "\"/software/tar/\">GNU tar</a>, and many more."
+msgid ""
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\"></a>Į šiuos nesmagius, bet esminius komponentus įeina 
"
 "GNU surinkėjas (GAS) ir ryšių reguliavimo programa (GLD), abi dabar yra <a 
"
 "href=\"/software/binutils/\">GNU Binutils</a> paketo dalis, <a href=\"/"
 "software/tar/\">GNU tar</a> ir daug kitų."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"nottools\"></a>For-]{+For+} instance, The Bourne Again SHell
+# | (BASH), the PostScript interpreter <a
+# | href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the
+# | <a href=\"/software/libc/libc.html\">GNU C library</a> are not programming
+# | tools.  Neither are GNUCash, GNOME, and GNU Chess.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\"></a>Pavyzdžiui, Bourne Again SHell (BASH), PostScript "
 "sąsaja <a href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a> ir 
"
 "<a href=\"/software/libc/libc.html\">GNU C biblioteka</a> nėra programavimo "
 "įrankiai.  Kaip nėra GNUCash, GNOME ir GNU Chess."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"somecomponents\"></a>For-]{+For+} instance, the <a
+# | href=\"/software/libc/libc.html\">GNU C library</a>.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\"></a>Pavyzdžiui, <a href=\"/software/libc/libc.html"
 "\">GNU C biblioteką</a>."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"newersystems\"></a>Since-]{+Since+} that was written, a
+# | nearly-all-free Windows-like system has been developed, but technically it
+# | is not at all like GNU or Unix, so it doesn't really affect this issue. 
+# | Most of the kernel of Solaris has been made free, but if you wanted to
+# | make a free system out of that, aside from replacing the missing parts of
+# | the kernel, you would also need to put it into GNU or BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\"></a>Nuo tada, kada tai buvo parašyta, buvo išvystyta 
"
 "beveik visa laisva, panaši į Windows sistema, bet techniškai ji visiškai "
@@ -529,15 +681,31 @@
 "to padaryti laisvą sistemą, be tų branduoliui trūkstamų dalių 
pakeitimo, "
 "jums taip pat reikėtų jį patalpinti į GNU arba BSD."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"gnubsd\"></a>On-]{+On+} the other hand, in the years since this
+# | article was written, the GNU C Library has been ported to several versions
+# | of the BSD kernel, which made it straightforward to combine the GNU system
+# | with that kernel.  Just as with GNU/Linux, these are indeed variants of
+# | GNU, and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD
+# | depending on the kernel of the system.  Ordinary users on typical desktops
+# | can hardly distinguish between GNU/Linux and GNU/*BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
+#| "was written, the GNU C Library has been ported to several versions of the "
+#| "BSD kernel, which made it straightforward to combine the GNU system with "
+#| "that kernel.  Just as with GNU/Linux, these are indeed variants of GNU, "
+#| "and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD "
+#| "depending on the kernel of the system.  Ordinary users on typical "
+#| "desktops can hardly distinguish between GNU/Linux and GNU/*BSD."
+msgid ""
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a id=\"gnubsd\"></a>Kitą vertus, bėgant metams nuo šio straipsnio 
parašymo, "
 "GNU C Library buvo perkelta į keletą BSD branduolio versijų, kas padarė "
@@ -604,15 +772,13 @@
 "PERSKAITYKITEMANE</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; [-1997, 1998, 1999, 2000, 2001, 2002,-] {+1997-2002,+}
-# | 2007, [-2014, 2015, 2016, 2017-] {+2014-2017, 2019, 2021+} Richard M.
-# | Stallman
+# | Copyright &copy; [-1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014, 2015,
+# | 2016, 2017-] {+1997-2002, 2005, 2008, 2019, 2021+} Richard [-M.-] Stallman
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014, 2015, "
 #| "2016, 2017 Richard M. Stallman"
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014, 2015, 2016, "
 "2017 Richard M. Stallman"
@@ -637,6 +803,11 @@
 msgid "Updated:"
 msgstr "Atnaujinta:"
 
+#, fuzzy
+#~| msgid "Notes:"
+#~ msgid "Notes"
+#~ msgstr "Pastabos:"
+
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"

Index: gnu/po/linux-and-gnu.ml-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ml-diff.html,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- gnu/po/linux-and-gnu.ml-diff.html   7 Apr 2021 18:04:07 -0000       1.17
+++ gnu/po/linux-and-gnu.ml-diff.html   30 Aug 2021 13:34:54 -0000      1.18
@@ -10,44 +10,49 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.77</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;Linux and GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU 
HURD, Hurd" /&gt;
 &lt;meta http-equiv="Description" content="Since 1983, developing the free 
Unix style operating system GNU, so that computer users can have the freedom to 
share and improve the software they use." /&gt;
 &lt;!--#include virtual="/gnu/po/linux-and-gnu.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;Linux</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;Linux</em></ins></span> 
and the GNU System&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;Linux and the GNU System&lt;/h2&gt;
 
-<span 
class="removed"><del><strong>&lt;p&gt;&lt;strong&gt;by</strong></del></span>
+<span class="removed"><del><strong>&lt;p&gt;&lt;strong&gt;by &lt;a 
href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;address class="byline 
c"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
-<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;
-
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;For</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;For</em></ins></span> more 
information see also
+  &lt;blockquote&gt;&lt;p&gt;For more information see also
 the &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;,
-and &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;&lt;/p&gt;
-  <span class="removed"><del><strong>&lt;/blockquote&gt;</strong></del></span>
-&lt;/div&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;
+and</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;address 
class="byline"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="/gnu/why-gnu-linux.html"&gt;Why 
GNU/Linux?&lt;/a&gt;&lt;/p&gt;
+  &lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;
 Many computer users run a modified version of
 &lt;a href="/philosophy/categories.html#TheGNUsystem"&gt;the GNU 
system&lt;/a&gt;
 every day, without realizing it.  Through a peculiar turn of events,
 the version of GNU which is widely used today is often called
-&ldquo;Linux&rdquo;, and many of its users
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> and 
many of its users
 are &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt; not aware&lt;/a&gt;
 that it is basically the GNU system, developed by the
 &lt;a href="/gnu/gnu-history.html"&gt;GNU Project&lt;/a&gt;.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;div class="announcement comment" 
role="complementary"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;p&gt;For more information see also
+the &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;,
+and &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;</em></ins></span>
+
 &lt;p&gt;
 There really is a Linux, and these people are using it, but it is just
 a part of the system they use.  Linux is the kernel: the program in
@@ -63,7 +68,8 @@
 &lt;p&gt;
 Many users do not understand the difference between the kernel, which
 is Linux, and the whole system, which they also call
-&ldquo;Linux&rdquo;.  The ambiguous use of the name doesn't help
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  The 
ambiguous use of the name doesn't help
 people understand.  These users often think that Linus Torvalds
 developed the whole operating system in 1991, with a bit of help.&lt;/p&gt;
 
@@ -100,7 +106,8 @@
 &lt;p&gt;
 If we tried to measure the GNU Project's contribution in this way,
 what would we conclude?  One CD-ROM vendor found that in their &ldquo;Linux
-distribution&rdquo;, &lt;a 
href="/philosophy/categories.html#GNUsoftware"&gt;GNU
+<span class="removed"><del><strong>distribution&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>distribution,&rdquo;</em></ins></span> &lt;a 
href="/philosophy/categories.html#GNUsoftware"&gt;GNU
 software&lt;/a&gt; was the largest single contingent, around 28% of the
 total source code, and this included some of the essential major
 components without which there could be no system.  Linux itself was
@@ -108,7 +115,7 @@
 repository of gNewSense, Linux is 1.5% and GNU packages are 15%.)
 So if you were going to pick a name for the system based on
 who wrote the programs in the system, the most appropriate single
-choice would be &ldquo;GNU&rdquo;.&lt;/p&gt;
+choice would be <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU.&rdquo;&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
 But that is not the deepest way to consider the question.  The GNU
@@ -147,7 +154,7 @@
 Fortunately, we didn't have to wait for the Hurd, because of Linux.
 Once Torvalds freed Linux in 1992, it fit into the last major gap in
 the GNU system.  People could
-then &lt;a 
href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+then &lt;a <span 
class="removed"><del><strong>href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
 combine Linux with the GNU system&lt;/a&gt; to make a complete free system
 &mdash; a version of the GNU system which also contained Linux.  The
 GNU/Linux system, in other words.&lt;/p&gt;
@@ -165,7 +172,7 @@
 
 &lt;p&gt;
 The GNU Project supports GNU/Linux systems as well as &lt;em&gt;the&lt;/em&gt; 
GNU
-system.  The &lt;a href="http://fsf.org/"&gt;FSF&lt;/a&gt; funded the 
rewriting of
+system.  The &lt;a <span 
class="removed"><del><strong>href="http://fsf.org/"&gt;FSF&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://fsf.org/"&gt;FSF&lt;/a&gt;</em></ins></span>
 funded the rewriting of
 the Linux-related extensions to the GNU C library, so that now they
 are well integrated, and the newest GNU/Linux systems use the current
 library release with no changes.  The FSF also funded an early stage
@@ -191,7 +198,7 @@
 be loaded into I/O devices when the system starts, and they are
 included, as long series of numbers, in the "source code" of Linux.
 Thus, maintaining free GNU/Linux distributions now entails maintaining
-a &lt;a href="http://directory.fsf.org/project/linux"&gt; free version of
+a &lt;a <span 
class="removed"><del><strong>href="http://directory.fsf.org/project/linux"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://directory.fsf.org/project/linux"&gt;</em></ins></span>
 free version of
 Linux&lt;/a&gt; too.&lt;/p&gt;
 
 &lt;p&gt;Whether you use GNU/Linux or not, please don't confuse the public
@@ -199,14 +206,16 @@
 kernel, one of the essential major components of the system.  The
 system as a whole is basically the GNU system, with Linux added.  When
 you're talking about this combination, please call it
-&ldquo;GNU/Linux&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.&lt;/p&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
 If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
 reference, this page and &lt;a href="/gnu/the-gnu-project.html"&gt;
-http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt; are good choices.  If
+<span 
class="removed"><del><strong>http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>https://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</em></ins></span>
 are good choices.  If
 you mention Linux, the kernel, and want to add a link for further
-reference, &lt;a 
href="http://foldoc.org/linux"&gt;http://foldoc.org/linux&lt;/a&gt; 
+reference, &lt;a <span 
class="removed"><del><strong>href="http://foldoc.org/linux"&gt;http://foldoc.org/linux&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://foldoc.org/linux"&gt;https://foldoc.org/linux&lt;/a&gt;</em></ins></span>
 
 is a good URL to use.&lt;/p&gt;
 <span class="inserted"><ins><em>&lt;div class="column-limit"&gt;&lt;/div&gt;
 
@@ -236,35 +245,44 @@
 <span 
class="removed"><del><strong>&lt;h3&gt;Notes:&lt;/h3&gt;</strong></del></span>
 <span class="inserted"><ins><em>&lt;div class="column-limit"&gt;&lt;/div&gt;
 
-&lt;h3 class="footnote"&gt;Notes&lt;/h3&gt;</em></ins></span>
+&lt;h3 class="footnote"&gt;Footnotes&lt;/h3&gt;</em></ins></span>
 &lt;ol&gt;
-&lt;li&gt;
-&lt;a id="unexciting"&gt;&lt;/a&gt;These unexciting but essential components
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="unexciting"&gt;&lt;/a&gt;These</strong></del></span>
+<span class="inserted"><ins><em>&lt;li 
id="unexciting"&gt;These</em></ins></span> unexciting but essential components
 include the GNU <span class="removed"><del><strong>assembler, 
GAS</strong></del></span> <span class="inserted"><ins><em>assembler 
(GAS)</em></ins></span> and the <span class="removed"><del><strong>linker, 
GLD,</strong></del></span> <span class="inserted"><ins><em>linker 
(GLD),</em></ins></span> both
 are now part of the &lt;a href="/software/binutils/"&gt;GNU Binutils&lt;/a&gt;
 package, &lt;a href="/software/tar/"&gt;GNU tar&lt;/a&gt;, and <span 
class="inserted"><ins><em>many</em></ins></span> more.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="nottools"&gt;&lt;/a&gt;For instance, The Bourne Again SHell (BASH),
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="nottools"&gt;&lt;/a&gt;For</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li id="nottools"&gt;For</em></ins></span> 
instance, The Bourne Again SHell (BASH),
 the PostScript interpreter
 &lt;a href="/software/ghostscript/ghostscript.html"&gt;Ghostscript&lt;/a&gt;, 
and the
 &lt;a href="/software/libc/libc.html"&gt;GNU C library&lt;/a&gt; are not
 programming tools.  Neither are GNUCash, GNOME, and GNU Chess.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="somecomponents"&gt;&lt;/a&gt;For instance, the
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="somecomponents"&gt;&lt;/a&gt;For</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li 
id="somecomponents"&gt;For</em></ins></span> instance, the
 &lt;a href="/software/libc/libc.html"&gt;GNU C library&lt;/a&gt;.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="newersystems"&gt;&lt;/a&gt;Since that was written, a nearly-all-free
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="newersystems"&gt;&lt;/a&gt;Since</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li 
id="newersystems"&gt;Since</em></ins></span> that was written, a nearly-all-free
 Windows-like system has been developed, but technically it is not at
 all like GNU or Unix, so it doesn't really affect this issue.  Most of
 the kernel of Solaris has been made free, but if you wanted to make a
 free system out of that, aside from replacing the missing parts of the
 kernel, you would also need to put it into GNU or BSD.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="gnubsd"&gt;&lt;/a&gt;On the other hand, in the years since this 
article
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="gnubsd"&gt;&lt;/a&gt;On</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li id="gnubsd"&gt;On</em></ins></span> the 
other hand, in the years since this article
 was written, the GNU C Library has been ported to several versions of
 the BSD kernel, which made it straightforward to combine the GNU system
 with that kernel.  Just as with GNU/Linux, these are indeed variants of
@@ -272,10 +290,8 @@
 GNU/kNetBSD depending on the kernel of the system.  Ordinary users on
 typical desktops can hardly distinguish between GNU/Linux and
 GNU/*BSD.&lt;/li&gt;
-
 &lt;/ol&gt;
-<span class="inserted"><ins><em>&lt;/div&gt;
-&lt;/div&gt;</em></ins></span>
+<span class="inserted"><ins><em>&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;
@@ -324,7 +340,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; <span class="removed"><del><strong>1997, 1998, 1999, 
2000, 2001, 2002,</strong></del></span> <span 
class="inserted"><ins><em>1997-2002,</em></ins></span> 2007, <span 
class="removed"><del><strong>2014</strong></del></span> <span 
class="inserted"><ins><em>2014-2017, 2019, 2021</em></ins></span> Richard M. 
Stallman&lt;/p&gt;
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>1997, 1998, 1999, 
2000, 2001, 2002,
+2007, 2014</strong></del></span> <span class="inserted"><ins><em>1997-2002, 
2005, 2008, 2019, 2021</em></ins></span> Richard <span 
class="removed"><del><strong>M.</strong></del></span> Stallman&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>
@@ -335,11 +352,12 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/04/07 18:04:07 $
+$Date: 2021/08/30 13:34:54 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-&lt;/div&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for class="inner", starts 
in the banner include --&gt;</em></ins></span>
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>

Index: gnu/po/linux-and-gnu.ml.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ml.po,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- gnu/po/linux-and-gnu.ml.po  7 Apr 2021 18:04:07 -0000       1.51
+++ gnu/po/linux-and-gnu.ml.po  30 Aug 2021 13:34:54 -0000      1.52
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2014-05-04 17:57+0530\n"
 "Last-Translator: Navaneeth <navaneeth@gnu.org>\n"
 "Language-Team: Malayalam <web-translators@gnu.org>\n"
@@ -42,33 +42,41 @@
 "സ്വാതന്ത്ര്യം 
ലഭിയ്ക്കുന്നതിനായി 1983 മുതല്‍ 
യുനിക്സ് പോലെയുള്ള 
സ്വതന്ത്രമായ ഓപ്പറേറ്റിങ്ങ് 
സിസ്റ്റം "
 "ഗ്നു 
നിര്‍മ്മിച്ചുകൊണ്ടിരിയ്ക്കുന്നു."
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "ലിനക്സും ഗ്നു സംവിധാനവും"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 # | by <a href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a>
 #, fuzzy
 #| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "എഴുതിയതു് <a 
href=\"http://www.stallman.org/\";>റിച്ചാര്‍ഡ് 
സ്റ്റാള്‍മാന്‍</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"ഈ വിഷയത്തെക്കുറിച്ചു് 
കൂടുതല്‍ അറിയാന്‍‍ <a 
href=\"/gnu/gnu-linux-faq.html\">ഗ്നു/ലിനക്സ് "
-"ചോദ്യോത്തരങ്ങള്‍</a>, <a 
href=\"/gnu/why-gnu-linux.html\">എന്തുകൊണ്ട് 
ഗ്നു/ലിനക്സ്?</a> "
-"എന്നീ ലേഖനങ്ങള്‍ കാണുക."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many computer users run a modified version of <a
+# | href=\"/philosophy/categories.html#TheGNUsystem\">the GNU system</a> every
+# | day, without realizing it.  Through a peculiar turn of events, the version
+# | of GNU which is widely used today is often called [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and many of its users are <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> that it is
+# | basically the GNU system, developed by the <a
+# | href=\"/gnu/gnu-history.html\">GNU Project</a>.
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -83,6 +91,15 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"ഈ വിഷയത്തെക്കുറിച്ചു് 
കൂടുതല്‍ അറിയാന്‍‍ <a 
href=\"/gnu/gnu-linux-faq.html\">ഗ്നു/ലിനക്സ് "
+"ചോദ്യോത്തരങ്ങള്‍</a>, <a 
href=\"/gnu/why-gnu-linux.html\">എന്തുകൊണ്ട് 
ഗ്നു/ലിനക്സ്?</a> "
+"എന്നീ ലേഖനങ്ങള്‍ കാണുക."
+
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -103,10 +120,22 @@
 "&ldquo;ലിനക്സ്&rdquo; എന്നു് 
പറയപ്പെടുന്ന എല്ലാ 
വിതരണങ്ങളും ശരിയ്ക്കും, 
ഗ്നു/ലിനക്സ് "
 "വിതരണങ്ങളാണു്."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many users do not understand the difference between the kernel, which is
+# | Linux, and the whole system, which they also call [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} The ambiguous use of the name doesn't help people
+# | understand.  These users often think that Linus Torvalds developed the
+# | whole operating system in 1991, with a bit of help.
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -116,7 +145,7 @@
 "കാര്യങ്ങള്‍ 
മനസ്സിലാക്കാന്‍ 
സഹായിയ്ക്കുന്നില്ല.  അല്പം 
സഹായത്തോടെ, 1991 ല്‍ ലിനസ് 
ടോര്‍വാള്‍ഡ്സാണു് "
 "മുഴുവന്‍ പ്രവര്‍ത്തക 
സംവിധാനവും 
വികസിപ്പിച്ചെടുത്തതെന്നാണു്
 ഈ ഉപയോക്താക്കള്‍ 
വിചാരിയ്ക്കുന്നതു്."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -134,7 +163,7 @@
 "ഉണ്ടാക്കാന്‍ ആവശ്യമായ ഒരു 
വിധം എല്ലാം തന്നെ നേരത്തെ 
ലഭ്യമായിരുന്നുവെന്നു് (ഒരു 
പ്രത്യേക "
 "കാരണമൊന്നുമില്ലാതെ) 
കണ്ടെത്തുകയുമാണുണ്ടായതു് 
എന്നാണു് പലരും  
വിശ്വസിയ്ക്കുന്നതു്."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free software</"
@@ -155,7 +184,7 @@
 "പദ്ധതികളുടെ 
രൂപരേഖവിവരിച്ചിട്ടുണ്ടായിരുന്നു.
 ലിനക്സ് 
തുടങ്ങിയപ്പോഴേയ്ക്കും ഗ്നു 
ഏതാണ്ടു് "
 "പൂര്‍ണ്ണമായിരുന്നു."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -171,18 +200,42 @@
 "ഇത്തരം സംരംഭങ്ങളുടെ 
സംഭാവനയെ വിലയിരുത്തുനതു് 
സ്വാഭാവികമായും, അ
തില്‍നിന്നുള്ള 
പ്രോഗ്രാമുകളുടെ "
 "വിജയത്തിന്റെ അ
ടിസ്ഥാനത്തിലാണു്."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If we tried to measure the GNU Project's contribution in this way, what
+# | would we conclude? One CD-ROM vendor found that in their &ldquo;Linux
+# | [-distribution&rdquo;,-] {+distribution,&rdquo;+} <a
+# | href=\"/philosophy/categories.html#GNUsoftware\">GNU software</a> was the
+# | largest single contingent, around 28% of the total source code, and this
+# | included some of the essential major components without which there could
+# | be no system.  Linux itself was about 3%.  (The proportions in 2008 are
+# | similar: in the &ldquo;main&rdquo; repository of gNewSense, Linux is 1.5%
+# | and GNU packages are 15%.)  So if you were going to pick a name for the
+# | system based on who wrote the programs in the system, the most appropriate
+# | single choice would be [-&ldquo;GNU&rdquo;.-] {+&ldquo;GNU.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "If we tried to measure the GNU Project's contribution in this way, what "
+#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
+#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
+#| "\">GNU software</a> was the largest single contingent, around 28% of the "
+#| "total source code, and this included some of the essential major "
+#| "components without which there could be no system.  Linux itself was "
+#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
+#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
+#| "15%.)  So if you were going to pick a name for the system based on who "
+#| "wrote the programs in the system, the most appropriate single choice "
+#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "ഇങ്ങനെയാണു് ഗ്നു 
സംരംഭത്തിന്റെ സംഭാവന അ
ളക്കുന്നതെങ്കില്‍ 
നിങ്ങള്‍ക്കെന്താണു് 
മനസ്സിലാക്കാന്‍ കഴിയുക? "
 "ഒരു സിഡി വിതരണക്കാരന്‍ 
കണ്ടെത്തിയതു് അവരുടെ 
&ldquo;ലിനക്സ് വിതരണത്തില്‍&rdquo;, 
ഏറ്റവും വലിയ "
@@ -194,7 +247,7 @@
 "പ്രോഗ്രാമുകളാരാണെഴുതിയതു് 
എന്നു് നോക്കിയിട്ടാണു് 
നിങ്ങള്‍ പേരു് 
നിശ്ചയിയ്ക്കുന്നതെങ്കില്‍ 
ഏറ്റവും യോജിച്ച "
 "ഒറ്റപ്പദം  &ldquo;ഗ്നു&rdquo; 
എന്നായിരിയ്ക്കും."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -210,7 +263,7 @@
 "സംരംഭവുമായിരുന്നില്ല. ഗ്നു 
സംരംഭത്തിന്റെ ലക്ഷ്യം ഗ്നു 
എന്നു് പേരുള്ള 
<em>സ്വതന്ത്രമായതും 
മുഴുവനായും "
 "യുണിക്സ്-പോലുള്ളതുമായ ഒരു 
സിസ്റ്റം</em> വികസിപ്പിയ്ക്കുക 
എന്നതായിരുന്നു."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -238,7 +291,7 @@
 "ചതുരംഗ കളി, ഗ്നു ചെസ്സ്, 
പോലും വികസിപ്പിച്ചെടുത്തു, 
കാരണം സമ്പൂര്‍ണ്ണമായ 
ഒരുസിസ്റ്റത്തിനു് നല്ല "
 "കളികളും ആവശ്യമാണു് എന്നതു് 
തന്നെ."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -254,11 +307,27 @@
 "hurd-and-linux.html\">2001 ല്‍ ഗ്നു ഹര്‍ഡ് 
വിശ്വസനീയമായി 
പ്രവര്‍ത്തിച്ചു് തുടങ്ങി</a>, 
പക്ഷേ "
 "ഇതു് ആളുകള്‍ക്കു് പൊതുവില്‍ 
ഉപയോഗിയ്ക്കാന്‍ 
തയ്യാറാകാന്‍ ഇനിയും എത്രയോ 
ദൂരം പോകാനുണ്ടു്."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once
+# | Torvalds freed Linux in 1992, it fit into the last major gap in the GNU
+# | system.  People could then <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | combine Linux with the GNU system</a> to make a complete free system
+# | &mdash; a version of the GNU system which also contained Linux.  The
+# | GNU/Linux system, in other words.
+#, fuzzy
+#| msgid ""
+#| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
+#| "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
+#| "system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+#| "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the "
+#| "GNU system</a> to make a complete free system &mdash; a version of the "
+#| "GNU system which also contained Linux.  The GNU/Linux system, in other "
+#| "words."
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -270,7 +339,7 @@
 "സ്വതന്ത്രമായ സിസ്റ്റം &ndash; 
ഗ്നു സിസ്റ്റത്തിന്റെ 
ലിനക്സ് അടിസ്ഥാനമായൊരു 
പതിപ്പു് നിര്‍മ്മിക്കാന്‍ "
 "സാധിച്ചു. ചുരുക്കത്തില്‍ 
ഗ്നു/ലിനക്സ്."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -291,11 +360,25 @@
 "തന്നെ സിസ്റ്റത്തിന്റെ പല 
വിതരണങ്ങളും 
വികസിപ്പിച്ചെടുത്തവര്‍ പല അ
ത്യാവശ്യ പണികളും ചെയ്തു. 
പക്ഷേ "
 "അവ പലതും ആ ജോലിയുടെ സ്വഭാവം 
കൊണ്ടു്, ഉറപ്പായും 
ആരെങ്കിലും ചെയ്യാന്‍ 
പോകുന്നവയായിരുന്നു."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU
+# | system.  The <a href=\"http{+s+}://fsf.org/\">FSF</a> funded the rewriting
+# | of the Linux-related extensions to the GNU C library, so that now they are
+# | well integrated, and the newest GNU/Linux systems use the current library
+# | release with no changes.  The FSF also funded an early stage of the
+# | development of Debian GNU/Linux.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -306,7 +389,7 @@
 "ലൈബ്രറി പതിപ്പുകള്‍ 
മാറ്റമൊന്നുമില്ലാതെ തന്നെ 
ഗ്നു/ലിനക്സ് 
സിസ്റ്റത്തിലുപയോഗിക്കുന്നു. 
എഫ്എസ്എഫ്, "
 "ഡെബിയന്‍ ഗ്നു/ലിനക്സിന്റെ 
ആദ്യഘട്ട വികസനത്തിനും 
പണംമുടക്കി."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Today there are many different variants of the GNU/Linux system (often
 # | called &ldquo;distros&rdquo;).  Most of them include [-non-free
 # | software&mdash;their-] {+nonfree programs&mdash;their+} developers follow
@@ -348,15 +431,15 @@
 "gnewsense.org/\">ഗ്ന്യൂസെന്‍സ്</a> എന്നീ 
രണ്ടു് വിതരണങ്ങളെ എഫ്എസ്എഫ് 
കമ്പ്യൂട്ടര്‍ സൌകര്യങ്ങള്‍ 
നല്കി "
 "പിന്തുണയ്ക്കുന്നു."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Making a free GNU/Linux distribution is not just a matter of eliminating
 # | various non[---]free programs.  Nowadays, the usual version of Linux
 # | contains non[---]free programs too.  These programs are intended to be
 # | loaded into I/O devices when the system starts, and they are included, as
 # | long series of numbers, in the \"source code\" of Linux.  Thus,
 # | maintaining free GNU/Linux distributions now entails maintaining a <a
-# | href=\"http://directory.fsf.org/project/linux\";> free version of Linux</a>
-# | too.
+# | href=\"http{+s+}://directory.fsf.org/project/linux\"> free version of
+# | Linux</a> too.
 #, fuzzy
 #| msgid ""
 #| "Making a free GNU/Linux distribution is not just a matter of eliminating "
@@ -372,7 +455,7 @@
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 "സ്വതന്ത്രമായ ഒരു 
ഗ്നു/ലിനക്സ് 
വിതരണമുണ്ടാക്കുന്നതു്, 
സ്വതന്ത്രമല്ലാത്ത പല 
പ്രോഗ്രാമുകളേയും 
ഒഴിവാക്കുന്ന "
@@ -383,13 +466,26 @@
 "ഗ്നു/ലിനക്സ് വിതരണങ്ങള്‍ 
പരിപാലിക്കുക എന്നതു് <a 
href=\"http://directory.fsf.org/project/";
 "linux\">ലിനക്സിന്റെ ഒരു 
സ്വതന്ത്ര പതിപ്പിന്റെ</a> 
പരിപാലനം  കൂടിയാവുന്നു."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Whether you use GNU/Linux or not, please don't confuse the public by using
+# | the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the
+# | essential major components of the system.  The system as a whole is
+# | basically the GNU system, with Linux added.  When you're talking about
+# | this combination, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "നിങ്ങള്‍ ഗ്നു/ലിനക്സ് 
ഉപയോഗിച്ചാലും ഇല്ലെങ്കിലും, 
ദയവായി &ldquo;ലിനക്സ്&rdquo; എന്ന 
പേരു് "
 "സംശയത്തിനിട വരുത്തുന്ന 
തരത്തില്‍ ഉപയോഗിച്ചു് 
ആളുകളെ 
ആശയക്കുഴപ്പത്തിലാക്കരുതു്. 
ലിനക്സ് എന്നാല്‍, "
@@ -398,13 +494,29 @@
 "സിസ്റ്റത്തേപറ്റിയാണു് 
സംസാരിയ്ക്കുന്നതെങ്കില്‍ 
ദയവായി അതിനെ 
&ldquo;ഗ്നു/ലിനക്സ്&rdquo; എന്നു് "
 "വിളിയ്ക്കുക."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
+# | reference, this page and <a href=\"/gnu/the-gnu-project.html\">
+# | http{+s+}://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
+# | you mention Linux, the kernel, and want to add a link for further
+# | reference, <a
+# | [-href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a>-]
+# | {+href=\"https://foldoc.org/linux\";>https://foldoc.org/linux</a>+} is a
+# | good URL to use.
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "നിങ്ങള്‍ക്കു് 
&ldquo;ഗ്നു/ലിനക്സിനെക്കുറിച്ചു്&rdquo;
 കൂടുതല്‍ വിവരത്തിനായി സൂചിക 
ചേര്‍ക്കണമെങ്കില്‍ ഈ "
 "ലേഖനവും <a href=\"/gnu/the-gnu-project.html\"> 
http://www.gnu.org/gnu/the-gnu-";
@@ -412,11 +524,11 @@
 "വിവരത്തിനു് <a 
href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> എന്ന "
 "യുആര്‍എല്‍  
ഉപയോഗിയ്ക്കാവുന്നതാണു്."
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr "അടിക്കുറിപ്പു്"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Aside from GNU, one other project has independently produced a free
 # | Unix-like operating system.  This system is known as BSD, and it was
 # | developed at UC Berkeley.  It was non[---]free in the 80s, but became free
@@ -446,7 +558,7 @@
 "പ്രവര്‍ത്തക സംവിധാനം 
ഏതാണ്ടുറപ്പായും ഗ്നുവില്‍ 
നിന്നുള്ളൊരു രൂപാന്തരമോ അ
ല്ലെങ്കില്‍ ഒരു ബിഎസ്ഡി "
 "സിസ്റ്റമോ ആണു്."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -467,54 +579,95 @@
 "രചയിതാക്കള്‍ ഒരു 
കെര്‍ണലെഴുതി ഗ്നുവിനോടു് 
ചേര്‍ത്തതല്ലാത്തതിനാല്‍ 
തന്നെ ഗ്നു/ബിഎസ്ഡി എന്ന പേരു് 
ഇവിടെ "
 "ചേരുകയില്ല.&nbsp;<a href=\"#gnubsd\">(5)</a>"
 
-#. type: Content of: <div><div><h3>
-# | Notes[-:-]
+# type: Content of: <h4>
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Footnotes"
+msgid "Footnotes"
+msgstr "അടിക്കുറിപ്പു്"
+
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"unexciting\"></a>These-]{+These+} unexciting but essential
+# | components include the GNU assembler (GAS) and the linker (GLD), both are
+# | now part of the <a href=\"/software/binutils/\">GNU Binutils</a> package,
+# | <a href=\"/software/tar/\">GNU tar</a>, and many more.
 #, fuzzy
-#| msgid "Notes:"
-msgid "Notes"
-msgstr "കുറിപ്പുകള്‍"
-
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+#| msgid ""
+#| "<a id=\"unexciting\"></a>These unexciting but essential components "
+#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
+#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
+#| "\"/software/tar/\">GNU tar</a>, and many more."
+msgid ""
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\"></a>ഇപ്പോള്‍ <a 
href=\"/software/binutils/\">ഗ്നു "
 "ബിന്‍യൂട്ടില്‍സിന്റെ</a> 
ഭാഗമായ ഗ്നു അസംബ്ലര്‍ എന്ന 
ജിഎഎസ്, ലിങ്കര്‍ എന്ന 
ജിഎല്‍ഡി എന്നീ "
 "പാക്കേജുകളും <a href=\"/software/tar/\">ഗ്നു 
ടാറും</a>, മറ്റു് പലതും 
ഉള്‍ക്കൊള്ളുന്നതാണു് ഈ "
 "അത്യാവശ്യവും എന്നാല്‍ 
രസകരമല്ലാത്തതുമായ 
ഘടകങ്ങള്‍."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"nottools\"></a>For-]{+For+} instance, The Bourne Again SHell
+# | (BASH), the PostScript interpreter <a
+# | href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the
+# | <a href=\"/software/libc/libc.html\">GNU C library</a> are not programming
+# | tools.  Neither are GNUCash, GNOME, and GNU Chess.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\"></a>ഉദാഹരണത്തിനു് 
ബോണ്‍ എഗെയിന്‍ ഷെല്‍ (ബാഷ്), <a 
href=\"/software/"
 
"ghostscript/ghostscript.html\">ഗോസ്റ്റ്സ്ക്രിപ്റ്റ്</a>
 എന്ന പോസ്റ്റ്സ്ക്രിപ്റ്റ് 
ഇന്റര്‍പ്രട്ടര്‍, "
 "<a href=\"/software/libc/libc.html\">ഗ്നു സി 
ലൈബ്രറി</a> തുടങ്ങിയവ 
പ്രോഗ്രാമിങ്ങിനുള്ള "
 "ഉപകരണങ്ങളല്ല. ഗ്നുകാഷ്, 
ഗ്നോം, ഗ്നു ചെസ്സ് എന്നിവയും അ
ത്തരത്തിലുള്ളവയല്ല."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"somecomponents\"></a>For-]{+For+} instance, the <a
+# | href=\"/software/libc/libc.html\">GNU C library</a>.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\"></a>ഉദാഹരണത്തിനു്, <a 
href=\"/software/libc/libc.html"
 "\">ഗ്നു സി ലൈബ്രറി</a>."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"newersystems\"></a>Since-]{+Since+} that was written, a
+# | nearly-all-free Windows-like system has been developed, but technically it
+# | is not at all like GNU or Unix, so it doesn't really affect this issue. 
+# | Most of the kernel of Solaris has been made free, but if you wanted to
+# | make a free system out of that, aside from replacing the missing parts of
+# | the kernel, you would also need to put it into GNU or BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\"></a>ഇതെഴുതിയതിനു് 
ശേഷം ഏതാണ്ടു് മുഴുവന്‍ 
സ്വതന്ത്രമായ - വിന്‍ഡോസ് "
 "മാതൃകയിലുള്ള ഒരു സിസ്റ്റം 
നിര്‍മ്മിയ്ക്കപ്പെടുകയുണ്ടായി,
 പക്ഷെ സാങ്കേതികമായി അതു് 
ഗ്നുവിനെ "
@@ -522,15 +675,31 @@
 "ഏതാണ്ടെല്ലാം 
സ്വതന്ത്രമാണു്. പക്ഷെ അ
തുപയോഗിയ്ക്കണമെങ്കില്‍ 
കേര്‍ണലില്‍ വിട്ടു പോയ 
ഭാഗങ്ങള്‍ "
 "ചേര്‍ക്കുന്നതിനു് പുറമെ അ
തു് ഗ്നു വിലോ ബിഎസ്ഡിയിലോ 
ചേര്‍ക്കുകയോ വേണം."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"gnubsd\"></a>On-]{+On+} the other hand, in the years since this
+# | article was written, the GNU C Library has been ported to several versions
+# | of the BSD kernel, which made it straightforward to combine the GNU system
+# | with that kernel.  Just as with GNU/Linux, these are indeed variants of
+# | GNU, and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD
+# | depending on the kernel of the system.  Ordinary users on typical desktops
+# | can hardly distinguish between GNU/Linux and GNU/*BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
+#| "was written, the GNU C Library has been ported to several versions of the "
+#| "BSD kernel, which made it straightforward to combine the GNU system with "
+#| "that kernel.  Just as with GNU/Linux, these are indeed variants of GNU, "
+#| "and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD "
+#| "depending on the kernel of the system.  Ordinary users on typical "
+#| "desktops can hardly distinguish between GNU/Linux and GNU/*BSD."
+msgid ""
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a id=\"gnubsd\"></a>എന്നാല്‍, ഈ ലേഖനം 
എഴുതിയതിനു് ശേഷം 
വര്‍ഷങ്ങള്‍ കഴിഞ്ഞപ്പോള്‍ 
ഗ്നു സി "
 "ലൈബ്രറി 
പ്രവര്‍ത്തിയ്ക്കുന്നതാക്കിയട്ടുണ്ടു്
 എന്നതു് ഗ്നു സിസ്റ്റവും ആ 
കെര്‍ണലും 
ഒന്നിപ്പിയ്ക്കുന്നതു് "
@@ -591,14 +760,13 @@
 "README.translations.html\">Translations README</a> നോക്കുക."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; [-1997, 1998, 1999, 2000, 2001, 2002,-] {+1997-2002,+}
-# | 2007, [-2014-] {+2014-2017, 2019, 2021+} Richard M. Stallman
+# | Copyright &copy; [-1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014-]
+# | {+1997-2002, 2005, 2008, 2019, 2021+} Richard [-M.-] Stallman
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014 Richard "
 #| "M. Stallman"
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014 Richard "
 "Stallman | റിച്ചാര്‍ഡ് 
സ്റ്റാള്‍മാന്‍"
@@ -625,6 +793,11 @@
 msgid "Updated:"
 msgstr "പുതുക്കിയതു്:"
 
+#, fuzzy
+#~| msgid "Notes:"
+#~ msgid "Notes"
+#~ msgstr "കുറിപ്പുകള്‍"
+
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"

Index: gnu/po/linux-and-gnu.nl.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.nl.po,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- gnu/po/linux-and-gnu.nl.po  30 May 2021 20:26:35 -0000      1.38
+++ gnu/po/linux-and-gnu.nl.po  30 Aug 2021 13:34:54 -0000      1.39
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Justin van Steijn <jvs@fsfe.org>\n"
 "Language-Team: Dutch\n"
@@ -15,6 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "X-Generator: Poedit 2.3\n"
 
 #. type: Content of: <title>
@@ -39,30 +40,38 @@
 "zodat computergebruikers de vrijheid hebben om de software die zij gebruiken "
 "te delen en te verbeteren."
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "Linux en het GNU-systeem"
 
 # type: Content of: <ul><li><ul><li>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"Voor meer informatie hierover, zie ook <a href=\"/gnu/gnu-linux-faq.html"
-"\">GNU/Linux veelgestelde vragen</a>, en <a href=\"/gnu/why-gnu-linux.html"
-"\">Waarom GNU/Linux?</a>"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many computer users run a modified version of <a
+# | href=\"/philosophy/categories.html#TheGNUsystem\">the GNU system</a> every
+# | day, without realizing it.  Through a peculiar turn of events, the version
+# | of GNU which is widely used today is often called [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and many of its users are <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> that it is
+# | basically the GNU system, developed by the <a
+# | href=\"/gnu/gnu-history.html\">GNU Project</a>.
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -77,6 +86,15 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"Voor meer informatie hierover, zie ook <a href=\"/gnu/gnu-linux-faq.html"
+"\">GNU/Linux veelgestelde vragen</a>, en <a href=\"/gnu/why-gnu-linux.html"
+"\">Waarom GNU/Linux?</a>"
+
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -98,10 +116,22 @@
 "GNU/Linux dus. Al die zogeheten &ldquo;Linux&rdquo; distributies zijn dus "
 "eigenlijk GNU/Linux-distributies."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many users do not understand the difference between the kernel, which is
+# | Linux, and the whole system, which they also call [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} The ambiguous use of the name doesn't help people
+# | understand.  These users often think that Linus Torvalds developed the
+# | whole operating system in 1991, with a bit of help.
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -112,7 +142,7 @@
 "vaak dat Linus Torvalds het hele systeem heeft ontwikkeld in 1991, met wat "
 "hulp van buitenaf."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -129,7 +159,7 @@
 "op zoek gingen naar andere vrije software om het te completeren en de meeste "
 "andere onderdelen zomaar vonden, klaar voor gebruik."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free software</"
@@ -150,7 +180,7 @@
 "a> van het GNU-project bevat ook een aantal doelen voor het GNU-systeem. "
 "Tegen de tijd dat Linus aan Linux begon was GNU al bijna af."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -167,18 +197,42 @@
 "dergelijk project af te meten aan de specifieke programma's die uit dat "
 "project kwamen."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If we tried to measure the GNU Project's contribution in this way, what
+# | would we conclude? One CD-ROM vendor found that in their &ldquo;Linux
+# | [-distribution&rdquo;,-] {+distribution,&rdquo;+} <a
+# | href=\"/philosophy/categories.html#GNUsoftware\">GNU software</a> was the
+# | largest single contingent, around 28% of the total source code, and this
+# | included some of the essential major components without which there could
+# | be no system.  Linux itself was about 3%.  (The proportions in 2008 are
+# | similar: in the &ldquo;main&rdquo; repository of gNewSense, Linux is 1.5%
+# | and GNU packages are 15%.)  So if you were going to pick a name for the
+# | system based on who wrote the programs in the system, the most appropriate
+# | single choice would be [-&ldquo;GNU&rdquo;.-] {+&ldquo;GNU.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "If we tried to measure the GNU Project's contribution in this way, what "
+#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
+#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
+#| "\">GNU software</a> was the largest single contingent, around 28% of the "
+#| "total source code, and this included some of the essential major "
+#| "components without which there could be no system.  Linux itself was "
+#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
+#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
+#| "15%.)  So if you were going to pick a name for the system based on who "
+#| "wrote the programs in the system, the most appropriate single choice "
+#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "Wanneer we zo de bijdrage van het GNU-project zouden bekijken, wat zou dan "
 "de conclusie zijn? Een verkoper van CD-ROM's kwam erachter dat in hun &ldquo;"
@@ -191,7 +245,7 @@
 "basis wie de programma's ervoor had geschreven dan zou je eerder uitkomen op "
 "&ldquo;GNU&rdquo;."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -207,7 +261,7 @@
 "tekstbewerkingsprogramma te maken, hoewel we die ontwikkeld hebben. Doel was "
 "om <em>een compleet vrij systeem te ontwikkelen, lijkend op Unix</em>: GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -235,7 +289,7 @@
 "waren <a href=\"#nottools\">(2)  </a>. We schreven zelfs een schaakspel, GNU "
 "Chess, omdat een compleet systeem ook spelletjes nodig heeft."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -251,11 +305,27 @@
 "2001 stabiel te draaien</a>. We hebben echter nog een lange weg te gaan "
 "voordat het klaar is voor algemeen gebruik."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once
+# | Torvalds freed Linux in 1992, it fit into the last major gap in the GNU
+# | system.  People could then <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | combine Linux with the GNU system</a> to make a complete free system
+# | &mdash; a version of the GNU system which also contained Linux.  The
+# | GNU/Linux system, in other words.
+#, fuzzy
+#| msgid ""
+#| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
+#| "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
+#| "system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+#| "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the "
+#| "GNU system</a> to make a complete free system &mdash; a version of the "
+#| "GNU system which also contained Linux.  The GNU/Linux system, in other "
+#| "words."
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -268,7 +338,7 @@
 "van het GNU-systeem dat ook Linux bevatte. Met andere woorden, het GNU/Linux-"
 "systeem."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -290,11 +360,25 @@
 "distributies ontwikkeld hebben droegen hun steentje bij maar dat zou toch "
 "wel opgepakt zijn."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU
+# | system.  The <a href=\"http{+s+}://fsf.org/\">FSF</a> funded the rewriting
+# | of the Linux-related extensions to the GNU C library, so that now they are
+# | well integrated, and the newest GNU/Linux systems use the current library
+# | release with no changes.  The FSF also funded an early stage of the
+# | development of Debian GNU/Linux.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -306,7 +390,7 @@
 "Linux-systemen gebruiken nu de bibliotheek zonder aparte wijzigingen. De FSF "
 "financierde ook de start van de ontwikkeling van Debian GNU/Linux."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Today there are many different variants of the GNU/Linux system (often "
 "called &ldquo;distros&rdquo;).  Most of them include nonfree programs&mdash;"
@@ -326,14 +410,31 @@
 "Maar er zijn ook <a href=\"/distros/distros.html\">compleet vrije GNU/Linux-"
 "distributies</a>. De FSF steunt hier een aantal van met computerapparatuur."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Making a free GNU/Linux distribution is not just a matter of eliminating
+# | various nonfree programs.  Nowadays, the usual version of Linux contains
+# | nonfree programs too.  These programs are intended to be loaded into I/O
+# | devices when the system starts, and they are included, as long series of
+# | numbers, in the \"source code\" of Linux.  Thus, maintaining free
+# | GNU/Linux distributions now entails maintaining a <a
+# | href=\"http{+s+}://directory.fsf.org/project/linux\"> free version of
+# | Linux</a> too.
+#, fuzzy
+#| msgid ""
+#| "Making a free GNU/Linux distribution is not just a matter of eliminating "
+#| "various nonfree programs.  Nowadays, the usual version of Linux contains "
+#| "nonfree programs too.  These programs are intended to be loaded into I/O "
+#| "devices when the system starts, and they are included, as long series of "
+#| "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/"
+#| "Linux distributions now entails maintaining a <a href=\"http://directory.";
+#| "fsf.org/project/linux\"> free version of Linux</a> too."
 msgid ""
 "Making a free GNU/Linux distribution is not just a matter of eliminating "
 "various nonfree programs.  Nowadays, the usual version of Linux contains "
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 "Het maken van een vrije GNU/Linux-distributie is niet alleen een kwestie van "
@@ -345,13 +446,26 @@
 "in dat we ook een <a href=\"http://directory.fsf.org/project/linux\";>vrije "
 "versie van Linux</a> moeten onderhouden."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Whether you use GNU/Linux or not, please don't confuse the public by using
+# | the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the
+# | essential major components of the system.  The system as a whole is
+# | basically the GNU system, with Linux added.  When you're talking about
+# | this combination, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Of je nu GNU/Linux gebruikt of niet, verwar mensen alsjeblieft niet door de "
 "naam &ldquo;Linux&rdquo; slordig te gebruiken. Linux is de kernel, een "
@@ -359,13 +473,29 @@
 "GNU-systeem met daaraan Linux toegevoegd. Wanneer je het over deze "
 "combinatie hebt, noem het dan alsjeblieft &ldquo;GNU/Linux&rdquo;."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
+# | reference, this page and <a href=\"/gnu/the-gnu-project.html\">
+# | http{+s+}://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
+# | you mention Linux, the kernel, and want to add a link for further
+# | reference, <a
+# | [-href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a>-]
+# | {+href=\"https://foldoc.org/linux\";>https://foldoc.org/linux</a>+} is a
+# | good URL to use.
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "Wanneer je een link naar &ldquo;GNU/Linux&rdquo; aan wilt maken ter "
 "referentie, dan zijn dit artikel en <a href=\"/gnu/thegnuproject.html\"> "
@@ -374,11 +504,11 @@
 "\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> een goede URL om te "
 "gebruiken."
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr "Aanvullingen"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Aside from GNU, one other project has independently produced a free Unix-"
 "like operating system.  This system is known as BSD, and it was developed at "
@@ -394,7 +524,7 @@
 "Een vrij en bestaand besturingssysteem<a href=\"#newersystems\">(4)</a> is "
 "tegenwoordig altijd een variant op het GNU systeem of op BSD."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -417,29 +547,53 @@
 "GNU-systeem en dus is een benaming als GNU/BSD hier niet op zijn plaats.<a "
 "href=\"#gnubsd\">(5)</a>"
 
-#. type: Content of: <div><div><h3>
-msgid "Notes"
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Footnotes"
+msgid "Footnotes"
 msgstr "Voetnoten"
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"unexciting\"></a>These-]{+These+} unexciting but essential
+# | components include the GNU assembler (GAS) and the linker (GLD), both are
+# | now part of the <a href=\"/software/binutils/\">GNU Binutils</a> package,
+# | <a href=\"/software/tar/\">GNU tar</a>, and many more.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"unexciting\"></a>These unexciting but essential components "
+#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
+#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
+#| "\"/software/tar/\">GNU tar</a>, and many more."
+msgid ""
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\"></a>Deze saaie maar belangrijke componenten zijn onder "
 "andere de GNU assembler (GAS) en de linker (GLD) beide nu onderdeel van het "
 "<a href=\"/software/binutils/\">GNU Binutils</a> pakket, <a href=\"/software/"
 "tar/\"> GNU tar</a>, en meer."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"nottools\"></a>For-]{+For+} instance, The Bourne Again SHell
+# | (BASH), the PostScript interpreter <a
+# | href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the
+# | <a href=\"/software/libc/libc.html\">GNU C library</a> are not programming
+# | tools.  Neither are GNUCash, GNOME, and GNU Chess.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\"></a>Bijvoorbeeld de Bourne Again SHell (BASH), de "
 "PostScript lezer <a href=\"/software/ghostscript/ghostscript.html"
@@ -447,22 +601,41 @@
 "bibliotheek</a> zijn geen programmeergereedschappen. Ook GNUCash, GNOME, en "
 "GNU Chess niet."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"somecomponents\"></a>For-]{+For+} instance, the <a
+# | href=\"/software/libc/libc.html\">GNU C library</a>.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\"></a>Bijvoorbeeld de <a href=\"/software/libc/libc."
 "html\">GNU C bibliotheek</a>."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"newersystems\"></a>Since-]{+Since+} that was written, a
+# | nearly-all-free Windows-like system has been developed, but technically it
+# | is not at all like GNU or Unix, so it doesn't really affect this issue. 
+# | Most of the kernel of Solaris has been made free, but if you wanted to
+# | make a free system out of that, aside from replacing the missing parts of
+# | the kernel, you would also need to put it into GNU or BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\"></a>Nadat dit was geschreven is er een bijna geheel "
 "vrij Windows-achtig systeem ontwikkeld, hoewel dit technisch gezien "
@@ -471,15 +644,31 @@
 "daar een vrij systeem van wilt maken zul je nog delen van de kernel moeten "
 "vervangen en het vervolgens in GNU of BSD moeten hangen."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"gnubsd\"></a>On-]{+On+} the other hand, in the years since this
+# | article was written, the GNU C Library has been ported to several versions
+# | of the BSD kernel, which made it straightforward to combine the GNU system
+# | with that kernel.  Just as with GNU/Linux, these are indeed variants of
+# | GNU, and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD
+# | depending on the kernel of the system.  Ordinary users on typical desktops
+# | can hardly distinguish between GNU/Linux and GNU/*BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
+#| "was written, the GNU C Library has been ported to several versions of the "
+#| "BSD kernel, which made it straightforward to combine the GNU system with "
+#| "that kernel.  Just as with GNU/Linux, these are indeed variants of GNU, "
+#| "and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD "
+#| "depending on the kernel of the system.  Ordinary users on typical "
+#| "desktops can hardly distinguish between GNU/Linux and GNU/*BSD."
+msgid ""
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a id=\"gnubsd\"></a>Hoewel, in de jaren na het verschijnen van dit artikel "
 "is de GNU C bibliotheek overgezet op diverse versies van de BSD kernel, die "
@@ -532,8 +721,13 @@
 "voor informatie over het onderhoud van vertalingen op deze website."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+# | Copyright &copy; 1997-2002, [-2007, 2014-2017,-] {+2005, 2008,+} 2019,
+# | 2021 Richard [-M.-] Stallman
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. "
+#| "Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
 
@@ -559,6 +753,9 @@
 msgid "Updated:"
 msgstr "Bijgewerkt:"
 
+#~ msgid "Notes"
+#~ msgstr "Voetnoten"
+
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"

Index: gnu/po/linux-and-gnu.pl.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.pl.po,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- gnu/po/linux-and-gnu.pl.po  20 Apr 2021 12:03:21 -0000      1.54
+++ gnu/po/linux-and-gnu.pl.po  30 Aug 2021 13:34:54 -0000      1.55
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-01-26 17:31-0600\n"
 "Last-Translator: Jan Owoc <jsowoc AT gmail.com>\n"
 "Language-Team: Polish <www-pl-trans@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-08-30 13:26+0000\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Virtaal 0.7.1\n"
@@ -43,29 +44,37 @@
 "zapewnić użytkownikom komputerów swobodę wymiany i&nbsp;ulepszania "
 "oprogramowania, którego używają."
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "Linux i&nbsp;System GNU"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"W&nbsp;celu uzyskania dodatkowych informacji zobacz również <a href=\"/gnu/"
-"gnu-linux-faq.html\">GNU/Linux FAQ</a> i&nbsp;<a href=\"/gnu/why-gnu-linux."
-"html\">Dlaczego GNU/Linux?</a>"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many computer users run a modified version of <a
+# | href=\"/philosophy/categories.html#TheGNUsystem\">the GNU system</a> every
+# | day, without realizing it.  Through a peculiar turn of events, the version
+# | of GNU which is widely used today is often called [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and many of its users are <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> that it is
+# | basically the GNU system, developed by the <a
+# | href=\"/gnu/gnu-history.html\">GNU Project</a>.
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -81,6 +90,15 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"W&nbsp;celu uzyskania dodatkowych informacji zobacz również <a href=\"/gnu/"
+"gnu-linux-faq.html\">GNU/Linux FAQ</a> i&nbsp;<a href=\"/gnu/why-gnu-linux."
+"html\">Dlaczego GNU/Linux?</a>"
+
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -101,10 +119,22 @@
 "dodatkiem Linuksa lub&nbsp;GNU/Linux. Wszystkie dystrybucje nazywane &ldquo;"
 "Linuksem&rdquo; są tak naprawdę dystrybucjami GNU/Linuksa."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many users do not understand the difference between the kernel, which is
+# | Linux, and the whole system, which they also call [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} The ambiguous use of the name doesn't help people
+# | understand.  These users often think that Linus Torvalds developed the
+# | whole operating system in 1991, with a bit of help.
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -115,7 +145,7 @@
 "często myślą, że&nbsp;to Linus Torvalds z&nbsp;niewielką pomocą "
 "zaprojektował cały system operacyjny w&nbsp;1991 roku."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -134,7 +164,7 @@
 "żadnej szczególnej przyczyny), że&nbsp;prawie wszystko niezbędne do&nbsp;"
 "stworzenia systemu uniksopodobnego było już dostępne."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free software</"
@@ -155,7 +185,7 @@
 "dotyczące systemu GNU. Gdy Linux dopiero co zaczynał, GNU był prawie "
 "ukończony."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -171,18 +201,42 @@
 "Window System). Naturalnym jest, że&nbsp;wkład wniesiony przez projekt "
 "ocenia się przez pryzmat programów, których dostarczył."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If we tried to measure the GNU Project's contribution in this way, what
+# | would we conclude? One CD-ROM vendor found that in their &ldquo;Linux
+# | [-distribution&rdquo;,-] {+distribution,&rdquo;+} <a
+# | href=\"/philosophy/categories.html#GNUsoftware\">GNU software</a> was the
+# | largest single contingent, around 28% of the total source code, and this
+# | included some of the essential major components without which there could
+# | be no system.  Linux itself was about 3%.  (The proportions in 2008 are
+# | similar: in the &ldquo;main&rdquo; repository of gNewSense, Linux is 1.5%
+# | and GNU packages are 15%.)  So if you were going to pick a name for the
+# | system based on who wrote the programs in the system, the most appropriate
+# | single choice would be [-&ldquo;GNU&rdquo;.-] {+&ldquo;GNU.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "If we tried to measure the GNU Project's contribution in this way, what "
+#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
+#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
+#| "\">GNU software</a> was the largest single contingent, around 28% of the "
+#| "total source code, and this included some of the essential major "
+#| "components without which there could be no system.  Linux itself was "
+#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
+#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
+#| "15%.)  So if you were going to pick a name for the system based on who "
+#| "wrote the programs in the system, the most appropriate single choice "
+#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "Jeżeli&nbsp;spróbowalibyśmy zmierzyć wkład wniesiony przez Projekt GNU "
 "w&nbsp;taki sposób, do&nbsp;jakiego doszlibyśmy wniosku? Jeden sprzedawca 
CD-"
@@ -196,7 +250,7 @@
 "opierając się na&nbsp;tym kto napisał programy w&nbsp;nim zawarte, "
 "najbardziej odpowiednim wyborem będzie &bdquo;GNU&rdquo;."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -213,7 +267,7 @@
 "jednakże zrobiliśmy to. Projekt GNU został stworzony po&nbsp;to, by "
 "zaprojektować <em>kompletny wolny system uniksopodobny</em>: GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -243,7 +297,7 @@
 "Napisaliśmy nawet grę szachową, GNU Chess, ponieważ&nbsp;kompletny system 
"
 "również potrzebuje gierek."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -259,11 +313,27 @@
 "html\">GNU Hurd zaczął działać stabilnie w&nbsp;2001 roku</a>, lecz&nbsp;"
 "jeszcze ma daleką drogę do&nbsp;bycia gotowym do&nbsp;powszechnego użytku."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once
+# | Torvalds freed Linux in 1992, it fit into the last major gap in the GNU
+# | system.  People could then <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | combine Linux with the GNU system</a> to make a complete free system
+# | &mdash; a version of the GNU system which also contained Linux.  The
+# | GNU/Linux system, in other words.
+#, fuzzy
+#| msgid ""
+#| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
+#| "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
+#| "system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+#| "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the "
+#| "GNU system</a> to make a complete free system &mdash; a version of the "
+#| "GNU system which also contained Linux.  The GNU/Linux system, in other "
+#| "words."
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -276,7 +346,7 @@
 "&ndash; wersji systemu GNU, który także zawierał Linuksa. Innymi słowy, "
 "system GNU/Linux."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -299,11 +369,25 @@
 "to jednak&nbsp;praca którą, jak to się zwykle dzieje, ktoś by 
na&nbsp;pewno "
 "wykonał."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU
+# | system.  The <a href=\"http{+s+}://fsf.org/\">FSF</a> funded the rewriting
+# | of the Linux-related extensions to the GNU C library, so that now they are
+# | well integrated, and the newest GNU/Linux systems use the current library
+# | release with no changes.  The FSF also funded an early stage of the
+# | development of Debian GNU/Linux.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -315,7 +399,7 @@
 "aktualnych bibliotek bez&nbsp;zmian. FSF sfinansowało również wczesny etap 
"
 "tworzenia Debian GNU/Linux."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Today there are many different variants of the GNU/Linux system (often "
 "called &ldquo;distros&rdquo;).  Most of them include nonfree programs&mdash;"
@@ -336,14 +420,31 @@
 "wolne dystrybucje GNU/Linuksa</a>. FSF wspiera zasoby komputerowe dla&nbsp;"
 "niektórych z&nbsp;nich."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Making a free GNU/Linux distribution is not just a matter of eliminating
+# | various nonfree programs.  Nowadays, the usual version of Linux contains
+# | nonfree programs too.  These programs are intended to be loaded into I/O
+# | devices when the system starts, and they are included, as long series of
+# | numbers, in the \"source code\" of Linux.  Thus, maintaining free
+# | GNU/Linux distributions now entails maintaining a <a
+# | href=\"http{+s+}://directory.fsf.org/project/linux\"> free version of
+# | Linux</a> too.
+#, fuzzy
+#| msgid ""
+#| "Making a free GNU/Linux distribution is not just a matter of eliminating "
+#| "various nonfree programs.  Nowadays, the usual version of Linux contains "
+#| "nonfree programs too.  These programs are intended to be loaded into I/O "
+#| "devices when the system starts, and they are included, as long series of "
+#| "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/"
+#| "Linux distributions now entails maintaining a <a href=\"http://directory.";
+#| "fsf.org/project/linux\"> free version of Linux</a> too."
 msgid ""
 "Making a free GNU/Linux distribution is not just a matter of eliminating "
 "various nonfree programs.  Nowadays, the usual version of Linux contains "
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 "Tworzenie wolnej dystrybucji GNU/Linux nie polega tylko na&nbsp;"
@@ -355,13 +456,26 @@
 "dystrybucji GNU/Linuksa pociąga także za&nbsp;sobą utrzymanie <a href="
 "\"http://directory.fsf.org/project/linux\";>wolnej wersji Linuksa</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Whether you use GNU/Linux or not, please don't confuse the public by using
+# | the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the
+# | essential major components of the system.  The system as a whole is
+# | basically the GNU system, with Linux added.  When you're talking about
+# | this combination, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Niezależnie czy&nbsp;używasz GNU/Linuksa czy&nbsp;też nie, proszę nie 
mylcie "
 "społeczeństwa prze używanie słowa &bdquo;Linux&rdquo; dwuznacznie. Linux "
@@ -369,13 +483,29 @@
 "bazuje na&nbsp;systemie GNU, do&nbsp;którego Linux został dodany. Kiedy "
 "mówicie o takim połączeniu, proszę mówcie wtedy &bdquo;GNU/Linux&rdquo;."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
+# | reference, this page and <a href=\"/gnu/the-gnu-project.html\">
+# | http{+s+}://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
+# | you mention Linux, the kernel, and want to add a link for further
+# | reference, <a
+# | [-href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a>-]
+# | {+href=\"https://foldoc.org/linux\";>https://foldoc.org/linux</a>+} is a
+# | good URL to use.
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "Jeżeli&nbsp;chcecie dodać odnośnik z&nbsp;informacjami na&nbsp;temat 
&bdquo;"
 "GNU/Linuksa&rdquo;, ta strona oraz&nbsp;<a href=\"/gnu/the-gnu-project.html"
@@ -384,11 +514,11 @@
 "w&nbsp;celu dalszego wyjaśnienia, <a 
href=\"http://foldoc.org/linux\";>http://";
 "foldoc.org/linux</a> jest dobrym adresem URL w&nbsp;tym celu."
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr "Postscriptum"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Aside from GNU, one other project has independently produced a free Unix-"
 "like operating system.  This system is known as BSD, and it was developed at "
@@ -405,7 +535,7 @@
 "niemalże na&nbsp;pewno albo&nbsp;odmianą systemu GNU, albo&nbsp;rodzajem "
 "systemu BSD."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -427,29 +557,50 @@
 "Deweloperzy BSD nie napisali jądra i&nbsp;nie dodali go do&nbsp;systemu GNU. 
"
 "Taka nazwa, jak GNU/BSD nie opisuje sytuacji. <a href=\"#gnubsd\">(5)</a>"
 
-#. type: Content of: <div><div><h3>
-msgid "Notes"
-msgstr "Przypisy [autora]"
-
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+#. type: Content of: <div><h3>
+msgid "Footnotes"
+msgstr "Przypisy"
+
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"unexciting\"></a>These-]{+These+} unexciting but essential
+# | components include the GNU assembler (GAS) and the linker (GLD), both are
+# | now part of the <a href=\"/software/binutils/\">GNU Binutils</a> package,
+# | <a href=\"/software/tar/\">GNU tar</a>, and many more.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"unexciting\"></a>These unexciting but essential components "
+#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
+#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
+#| "\"/software/tar/\">GNU tar</a>, and many more."
+msgid ""
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\"></a>Te mało porywające, lecz&nbsp;ważne komponenty, 
to "
 "między innymi assembler GNU (GAS) i&nbsp;linker (GLD), które są teraz "
 "częścią paczki<a href=\"/software/binutils/\">GNU Binutils</a>, <a 
href=\"/"
 "software/tar/\">GNU tar</a> i&nbsp;wielu innych."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"nottools\"></a>For-]{+For+} instance, The Bourne Again SHell
+# | (BASH), the PostScript interpreter <a
+# | href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the
+# | <a href=\"/software/libc/libc.html\">GNU C library</a> are not programming
+# | tools.  Neither are GNUCash, GNOME, and GNU Chess.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\"></a>Na&nbsp;przykład The Bourne Again SHell (powłoka "
 "BASH), interpreter PostScriptu <a href=\"/software/ghostscript/ghostscript."
@@ -457,22 +608,41 @@
 "\">biblioteka GNU C</a> nie są narzędziami programistycznymi. Nie są 
także "
 "nimi GNUCash, GNOME i&nbsp;GNU Chess."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"somecomponents\"></a>For-]{+For+} instance, the <a
+# | href=\"/software/libc/libc.html\">GNU C library</a>.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\"></a>Na&nbsp;przykład <a href=\"/software/libc/libc."
 "html\">biblioteka GNU C</a>."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"newersystems\"></a>Since-]{+Since+} that was written, a
+# | nearly-all-free Windows-like system has been developed, but technically it
+# | is not at all like GNU or Unix, so it doesn't really affect this issue. 
+# | Most of the kernel of Solaris has been made free, but if you wanted to
+# | make a free system out of that, aside from replacing the missing parts of
+# | the kernel, you would also need to put it into GNU or BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\"></a>Od&nbsp;kiedy to zostało napisane, 
prawie-całkiem-"
 "wolny Windowsopodobny system został zaprojektowany, lecz&nbsp;nie jest "
@@ -482,15 +652,31 @@
 "zastąpienia brakujących części jądra, musielibyście również 
umieścić go "
 "w&nbsp;GNU lub&nbsp;BSD."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"gnubsd\"></a>On-]{+On+} the other hand, in the years since this
+# | article was written, the GNU C Library has been ported to several versions
+# | of the BSD kernel, which made it straightforward to combine the GNU system
+# | with that kernel.  Just as with GNU/Linux, these are indeed variants of
+# | GNU, and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD
+# | depending on the kernel of the system.  Ordinary users on typical desktops
+# | can hardly distinguish between GNU/Linux and GNU/*BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
+#| "was written, the GNU C Library has been ported to several versions of the "
+#| "BSD kernel, which made it straightforward to combine the GNU system with "
+#| "that kernel.  Just as with GNU/Linux, these are indeed variants of GNU, "
+#| "and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD "
+#| "depending on the kernel of the system.  Ordinary users on typical "
+#| "desktops can hardly distinguish between GNU/Linux and GNU/*BSD."
+msgid ""
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a id=\"gnubsd\"></a>Z&nbsp;drugiej strony, przez lata które minęły 
od&nbsp;"
 "kiedy ten artykuł został napisany, Biblioteka GNU C została przeportowana "
@@ -547,8 +733,13 @@
 "tłumaczeń</a>."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+# | Copyright &copy; 1997-2002, [-2007, 2014-2017,-] {+2005, 2008,+} 2019,
+# | 2021 Richard [-M.-] Stallman
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. "
+#| "Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
 
@@ -574,3 +765,6 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Aktualizowane:"
+
+#~ msgid "Notes"
+#~ msgstr "Przypisy [autora]"

Index: gnu/po/linux-and-gnu.pot
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.pot,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- gnu/po/linux-and-gnu.pot    7 Apr 2021 18:04:07 -0000       1.38
+++ gnu/po/linux-and-gnu.pot    30 Aug 2021 13:34:54 -0000      1.39
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,27 +33,20 @@
 "use."
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr ""
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a "
-"href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, and <a "
-"href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many computer users run a modified version of <a "
 "href=\"/philosophy/categories.html#TheGNUsystem\">the GNU system</a> every "
 "day, without realizing it.  Through a peculiar turn of events, the version "
-"of GNU which is widely used today is often called &ldquo;Linux&rdquo;, and "
+"of GNU which is widely used today is often called &ldquo;Linux,&rdquo; and "
 "many of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> "
 "not aware</a> that it is basically the GNU system, developed by the <a "
 "href=\"/gnu/gnu-history.html\">GNU Project</a>."
@@ -61,6 +54,13 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a "
+"href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, and <a "
+"href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -72,16 +72,16 @@
 "GNU/Linux."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -92,7 +92,7 @@
 "necessary to make a Unix-like system was already available."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free "
@@ -104,7 +104,7 @@
 "for the GNU system. By the time Linux was started, GNU was almost finished."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a "
@@ -114,21 +114,21 @@
 "specific programs that came from the project."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -138,7 +138,7 @@
 "complete free Unix-like system</em>: GNU."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -154,7 +154,7 @@
 "because a complete system needs games too."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a "
@@ -165,18 +165,18 @@
 "use in general."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
 "system.  People could then <a "
-"href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>
 "
+"href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>
 "
 "combine Linux with the GNU system</a> to make a complete free system &mdash; "
 "a version of the GNU system which also contained Linux.  The GNU/Linux "
 "system, in other words."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -189,17 +189,17 @@
 "someone."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Today there are many different variants of the GNU/Linux system (often "
 "called &ldquo;distros&rdquo;).  Most of them include nonfree "
@@ -212,7 +212,7 @@
 "FSF supports computer facilities for a few of them."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making a free GNU/Linux distribution is not just a matter of eliminating "
 "various nonfree programs.  Nowadays, the usual version of Linux contains "
@@ -220,34 +220,34 @@
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
 "distributions now entails maintaining a <a "
-"href=\"http://directory.fsf.org/project/linux\";> free version of Linux</a> "
+"href=\"https://directory.fsf.org/project/linux\";> free version of Linux</a> "
 "too."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
 "this page and <a href=\"/gnu/the-gnu-project.html\"> "
-"http://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+"https://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
 "mention Linux, the kernel, and want to add a link for further reference, <a "
-"href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good URL "
+"href=\"https://foldoc.org/linux\";>https://foldoc.org/linux</a> is a good URL "
 "to use."
 msgstr ""
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Aside from GNU, one other project has independently produced a free "
 "Unix-like operating system.  This system is known as BSD, and it was "
@@ -257,7 +257,7 @@
 "GNU system, or a kind of BSD system."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -270,52 +270,49 @@
 "href=\"#gnubsd\">(5)</a>"
 msgstr ""
 
-#. type: Content of: <div><div><h3>
-msgid "Notes"
+#. type: Content of: <div><h3>
+msgid "Footnotes"
 msgstr ""
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a "
 "href=\"/software/binutils/\">GNU Binutils</a> package, <a "
 "href=\"/software/tar/\">GNU tar</a>, and many more."
 msgstr ""
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a "
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
 "href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
 "href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
 "tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a "
-"href=\"/software/libc/libc.html\">GNU C library</a>."
+#. type: Content of: <div><ol><li>
+msgid "For instance, the <a href=\"/software/libc/libc.html\">GNU C 
library</a>."
 msgstr ""
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
-"Windows-like system has been developed, but technically it is not at all "
-"like GNU or Unix, so it doesn't really affect this issue.  Most of the "
-"kernel of Solaris has been made free, but if you wanted to make a free "
-"system out of that, aside from replacing the missing parts of the kernel, "
-"you would also need to put it into GNU or BSD."
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -355,7 +352,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. 
Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 
 #. type: Content of: <div><p>

Index: gnu/po/linux-and-gnu.pt-br.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.pt-br.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- gnu/po/linux-and-gnu.pt-br.po       20 Apr 2021 07:31:37 -0000      1.27
+++ gnu/po/linux-and-gnu.pt-br.po       30 Aug 2021 13:34:54 -0000      1.28
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-04-20 03:42-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <www-pt-br-general@gnu.org>\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Gtranslator 40.0\n"
 
@@ -41,29 +42,29 @@
 "que usuários de computador possam ter a liberdade de compartilhar e melhorar 
"
 "o software que usam."
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "Linux e o Sistema GNU"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "por <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"Para mais informações, veja também <a href=\"/gnu/gnu-linux-faq.html"
-"\">Perguntas Frequentes sobre GNU/Linux</a> e <a href=\"/gnu/why-gnu-linux."
-"html\">Por que GNU/Linux?</a>"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -77,6 +78,15 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"Para mais informações, veja também <a href=\"/gnu/gnu-linux-faq.html"
+"\">Perguntas Frequentes sobre GNU/Linux</a> e <a href=\"/gnu/why-gnu-linux."
+"html\">Por que GNU/Linux?</a>"
+
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -97,10 +107,17 @@
 "GNU/Linux. Todas as distribuições chamadas de “Linux” são, na verdade, 
GNU/"
 "Linux."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -111,7 +128,7 @@
 "geralmente pensam que Linus Torvalds desenvolveu todo o sistema operacional "
 "em 1991, com um pouco de ajuda."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -129,7 +146,7 @@
 "livres e descobriram que (por nenhuma razão em particular) praticamente tudo 
"
 "necessário para criar um sistema similar ao Unix já estava disponível."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free software</"
@@ -150,7 +167,7 @@
 "originais para o sistema GNU. Quando o Linux iniciou, GNU já estava quase "
 "concluído."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -166,18 +183,31 @@
 "(o X Window System). É natural medir a contribuição deste tipo de projeto "
 "pelos programas específicos que vieram daquele projeto."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "If we tried to measure the GNU Project's contribution in this way, what "
+#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
+#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
+#| "\">GNU software</a> was the largest single contingent, around 28% of the "
+#| "total source code, and this included some of the essential major "
+#| "components without which there could be no system.  Linux itself was "
+#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
+#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
+#| "15%.)  So if you were going to pick a name for the system based on who "
+#| "wrote the programs in the system, the most appropriate single choice "
+#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "Se tentássemos medir a contribuição do Projeto GNU dessa forma, o que "
 "concluiríamos? Um distribuidor de CD-ROM percebeu que em sua 
“distribuição "
@@ -190,7 +220,7 @@
 "sistema baseado em quem escreveu os programas no sistema, a escolha simples "
 "mais apropriada seria “GNU”."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -206,7 +236,7 @@
 "texto, apesar de termos desenvolvido um. O objetivo do Projeto GNU era "
 "desenvolver <em>um sistema operacional livre similar ao Unix</em>: GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -235,7 +265,7 @@
 "(2)</a>. Nós desenvolvemos um jogo de xadrez, o GNU Chess, porque um sistema 
"
 "completo precisa de jogos também."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -252,11 +282,20 @@
 "segura em 2001</a>, mas está longe de estar pronto para as pessoas usarem, "
 "de forma geral."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
+#| "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
+#| "system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+#| "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the "
+#| "GNU system</a> to make a complete free system &mdash; a version of the "
+#| "GNU system which also contained Linux.  The GNU/Linux system, in other "
+#| "words."
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -268,7 +307,7 @@
 "sistema GNU</a> para compor um sistema livre completo &ndash; uma versão do "
 "sistema GNU contendo também o Linux. O sistema GNU/Linux, em outras 
palavras."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -290,11 +329,19 @@
 "várias distribuições de sistema fizeram um trabalho substancial. Mas foi 
um "
 "trabalho que, naturalmente, seria feito por alguém."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -306,7 +353,7 @@
 "usam a versão corrente da biblioteca sem modificações. A FSF também "
 "financiou um estágio inicial do desenvolvimento do Debian GNU/Linux."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Today there are many different variants of the GNU/Linux system (often "
 "called &ldquo;distros&rdquo;).  Most of them include nonfree programs&mdash;"
@@ -326,14 +373,23 @@
 "\">distros GNU/Linux completamente livres</a>. A FSF oferece suporte a "
 "instalações de computador para algumas delas."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Making a free GNU/Linux distribution is not just a matter of eliminating "
+#| "various nonfree programs.  Nowadays, the usual version of Linux contains "
+#| "nonfree programs too.  These programs are intended to be loaded into I/O "
+#| "devices when the system starts, and they are included, as long series of "
+#| "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/"
+#| "Linux distributions now entails maintaining a <a href=\"http://directory.";
+#| "fsf.org/project/linux\"> free version of Linux</a> too."
 msgid ""
 "Making a free GNU/Linux distribution is not just a matter of eliminating "
 "various nonfree programs.  Nowadays, the usual version of Linux contains "
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 "Fazer uma distribuição GNU/Linux não é apenas uma questão de eliminar 
vários "
@@ -344,13 +400,20 @@
 "distribuições GNU/Linux livres agora significa manter uma <a href=\"http://";
 "directory.fsf.org/project/linux\">versão do Linux livre</a> também."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Você usando GNU/Linux ou não, por favor não confunda o público usando o 
nome "
 "“Linux” de forma ambígua. Linux é o núcleo (kernel), um dos principais 
"
@@ -358,13 +421,21 @@
 "sistema GNU, com Linux adicionado. Quando você fala sobre essa combinação, 
"
 "por favor chame-a de “GNU/Linux”."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "Se você deseja fazer um link sobre “GNU/Linux” para posterior 
referência, "
 "essa página e <a href=\"/gnu/the-gnu-project.html\">http://www.gnu.org/gnu/";
@@ -373,11 +444,11 @@
 "href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> é uma boa URL "
 "para se usar."
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr "Observações"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Aside from GNU, one other project has independently produced a free Unix-"
 "like operating system.  This system is known as BSD, and it was developed at "
@@ -393,7 +464,7 @@
 "\"#newersystems\">(4)</a> é quase com certeza ou uma variante do sistema GNU 
"
 "ou um tipo de sistema BSD."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -416,51 +487,76 @@
 "GNU, e um nome como GNU/BSD não se adequaria à situação.<a 
href=\"#gnubsd\">"
 "(5)</a>"
 
-#. type: Content of: <div><div><h3>
-msgid "Notes"
-msgstr "Notas"
-
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+#. type: Content of: <div><h3>
+#, fuzzy
+#| msgid "Footnotes"
+msgid "Footnotes"
+msgstr "Notas de rodapé"
+
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"unexciting\"></a>These unexciting but essential components "
+#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
+#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
+#| "\"/software/tar/\">GNU tar</a>, and many more."
+msgid ""
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\"></a>Esses componentes não excitantes, mas essenciais, "
 "incluem o GNU assembler (GAS) e o linker (GLD), ambos agora parte do pacote "
 "<a href=\"/software/binutils/\">GNU Binutils</a>, <a href=\"/software/tar/"
 "\">GNU tar</a> e muito mais."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\"></a>Por exemplo, o Bourne Again SHell (BASH), o "
 "interpretador de PostScript <a href=\"/software/ghostscript/ghostscript.html"
 "\">Ghostscript</a> e a <a href=\"/software/libc/libc.html\">biblioteca C do "
 "GNU</a> não são ferramentas de programação. Nem o GNUCash, GNOME e GNU 
Chess."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\"></a>Por exemplo, a <a href=\"/software/libc/libc."
 "html\">biblioteca C do GNU</a>."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\"></a>Desde que foi escrito, um sistema quase-todo-"
 "livre similar ao Windows foi desenvolvido, mas tecnicamente não é todo como 
"
@@ -469,15 +565,24 @@
 "livre fora disto, além de substituir as partes faltando do kernel, você "
 "também precisaria colocá-la no GNU ou BSD."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
+#| "was written, the GNU C Library has been ported to several versions of the "
+#| "BSD kernel, which made it straightforward to combine the GNU system with "
+#| "that kernel.  Just as with GNU/Linux, these are indeed variants of GNU, "
+#| "and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD "
+#| "depending on the kernel of the system.  Ordinary users on typical "
+#| "desktops can hardly distinguish between GNU/Linux and GNU/*BSD."
+msgid ""
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a id=\"gnubsd\"></a>Por outro lado, nos anos que seguiram desde a escrita "
 "deste artigo, a biblioteca C do GNU foi portada para várias versões do "
@@ -532,8 +637,11 @@
 "contribuição com traduções das páginas deste site."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. "
+#| "Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
 
@@ -561,6 +669,9 @@
 msgid "Updated:"
 msgstr "Última atualização:"
 
+#~ msgid "Notes"
+#~ msgstr "Notas"
+
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"

Index: gnu/po/linux-and-gnu.ro.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ro.po,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gnu/po/linux-and-gnu.ro.po  31 May 2021 09:06:18 -0000      1.15
+++ gnu/po/linux-and-gnu.ro.po  30 Aug 2021 13:34:54 -0000      1.16
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+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"
@@ -41,12 +41,12 @@
 "utilizatorii de calculatoare să poată avea libertatea de a împărtăși 
și "
 "îmbunătăți software-ul pe care îl folosesc."
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "Linux și sistemul GNU"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 # | by <a [-href=\"http://www.stallman.org/\";>Richard M.-]
 # | {+href=\"https://www.stallman.org/\";>Richard+} Stallman</a>
 #, fuzzy
@@ -54,35 +54,16 @@
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "de <a href=\"http://www.stallman.org/\";>Richard M. Stallman</a>"
 
-#. type: Content of: <div><div><p>
-# | [-If you would like to learn-]{+For+} more [-about this issue, you can
-# | read our-] {+information see also the+} <a
-# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, and <a
-# | href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>
-#, fuzzy
-#| msgid ""
-#| "If you would like to learn more about this issue, you can read our <a "
-#| "href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, and <a href=\"/gnu/"
-#| "why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"Dacă doriți să aflați mai multe despre această chestiune, puteți citi 
pagina "
-"noastră de „întrebări puse frecvent”, <a 
href=\"/gnu/gnu-linux-faq.html"
-"\">GNU/Linux FAQ</a>, și <a href=\"/gnu/why-gnu-linux.html\">De ce 
GNU/Linux?"
-"</a>"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Many computer users run a modified version of <a
 # | href=\"/philosophy/categories.html#TheGNUsystem\">the GNU system</a> every
 # | day, without realizing it.  Through a peculiar turn of events, the version
-# | of GNU which is widely used today is [-more-] often [-known as-]
-# | {+called+} &ldquo;Linux&rdquo;, and many {+of its+} users are <a
-# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> [-of-]
-# | {+that it is basically+} the [-extent of its connection with-] {+GNU
-# | system, developed by+} the <a href=\"/gnu/gnu-history.html\">GNU
-# | Project</a>.
+# | of GNU which is widely used today is [-more-] often [-known as
+# | &ldquo;Linux&rdquo;,-] {+called &ldquo;Linux,&rdquo;+} and many {+of its+}
+# | users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not
+# | aware</a> [-of-] {+that it is basically+} the [-extent of its connection
+# | with-] {+GNU system, developed by+} the <a
+# | href=\"/gnu/gnu-history.html\">GNU Project</a>.
 #, fuzzy
 #| msgid ""
 #| "Many computer users run a modified version of <a href=\"/philosophy/"
@@ -96,7 +77,7 @@
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -110,6 +91,25 @@
 "gnu-history.html\">Proiectul GNU</a>."
 
 #. type: Content of: <div><div><p>
+# | [-If you would like to learn-]{+For+} more [-about this issue, you can
+# | read our-] {+information see also the+} <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, and <a
+# | href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>
+#, fuzzy
+#| msgid ""
+#| "If you would like to learn more about this issue, you can read our <a "
+#| "href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, and <a href=\"/gnu/"
+#| "why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"Dacă doriți să aflați mai multe despre această chestiune, puteți citi 
pagina "
+"noastră de „întrebări puse frecvent”, <a 
href=\"/gnu/gnu-linux-faq.html"
+"\">GNU/Linux FAQ</a>, și <a href=\"/gnu/why-gnu-linux.html\">De ce 
GNU/Linux?"
+"</a>"
+
+#. type: Content of: <div><p>
 # | There really is a Linux, and these people are using it, but it is [-not-]
 # | {+just a part of+} the [-operating system.-] {+system they use.+}  Linux
 # | is the kernel: the program in the system that allocates the machine's
@@ -150,13 +150,14 @@
 "operare GNU: sistemul este în fapt GNU, cu Linux funcționând ca și 
kernelul "
 "său."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Many users [-are-] {+do+} not [-fully aware of-] {+understand+} the
 # | [-distinction-] {+difference+} between the kernel, which is Linux, and the
-# | whole system, which they also call &ldquo;Linux&rdquo;.  The ambiguous use
-# | of the name doesn't [-promote understanding.-] {+help people understand.+}
-# |  These users often think that Linus Torvalds developed the whole operating
-# | system in 1991, with a bit of help.
+# | whole system, which they also call [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} The ambiguous use of the name doesn't [-promote
+# | understanding.-] {+help people understand.+}  These users often think that
+# | Linus Torvalds developed the whole operating system in 1991, with a bit of
+# | help.
 #, fuzzy
 #| msgid ""
 #| "Many users are not fully aware of the distinction between the kernel, "
@@ -166,7 +167,7 @@
 #| "whole operating system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -177,7 +178,7 @@
 "adesea cred că Linus Torvalds a dezvoltat întregul sistem de operare în "
 "1991, cu un pic de ajutor."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -195,7 +196,7 @@
 "funcționeze, și au descoperit că (din pură întâmplare) aproape tot ceea 
ce "
 "era necesar pentru a face un sistem similar Unix-ului era deja disponibil."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | What they found was no accident&mdash;it was the {+not-quite-complete+}
 # | GNU system.  The available <a href=\"/philosophy/free-sw.html\">free
 # | software</a> added up to a complete system because the GNU Project had
@@ -235,7 +236,7 @@
 "schițează de asemenea unele dintre planurile inițiale ale sistemului GNU. "
 "Până în momentul când Linux a fost scris, sistemul era aproape terminat."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -252,10 +253,10 @@
 "măsurăm contribuția acestui tip de proiecte prin programele specifice care 
"
 "au rezultat din proiect."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | If we tried to measure the GNU Project's contribution in this way, what
 # | would we conclude? One CD-ROM vendor found that in their &ldquo;Linux
-# | distribution&rdquo;, <a
+# | [-distribution&rdquo;,-] {+distribution,&rdquo;+} <a
 # | href=\"/philosophy/categories.html#GNUsoftware\">GNU software</a> was the
 # | largest single contingent, around 28% of the total source code, and this
 # | included some of the essential major components without which there could
@@ -263,7 +264,7 @@
 # | similar: in the &ldquo;main&rdquo; repository of gNewSense, Linux is 1.5%
 # | and GNU packages are 15%.)+}  So if you were going to pick a name for the
 # | system based on who wrote the programs in the system, the most appropriate
-# | single choice would be &ldquo;GNU&rdquo;.
+# | single choice would be [-&ldquo;GNU&rdquo;.-] {+&ldquo;GNU.&rdquo;+}
 #, fuzzy
 #| msgid ""
 #| "If we tried to measure the GNU Project's contribution in this way, what "
@@ -278,14 +279,14 @@
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "Dacă am încerca să măsurăm contribuția Proiectului GNU în acest fel, 
ce "
 "putem concluziona? Un distribuitor de CD-ROM-uri a constatat că în "
@@ -296,7 +297,7 @@
 "un nume pentru sistem pe baza celor care au scris programele din sistem, cea "
 "mai potrivită alegere individuală ar fi „GNU”."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | But [-we don't think-] that is {+not+} the [-right-] {+deepest+} way to
 # | consider the question.  The GNU Project was not, is not, a project to
 # | develop specific software packages.  It was not a project <a
@@ -328,7 +329,7 @@
 "GNU a fost să dezvolte <em>un sistem liber complet, similar Unix-ului</em>: "
 "GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Many people have made major contributions to the free software in the
 # | system, and they all deserve [-credit.-] {+credit for their software.+} 
 # | But the reason it is <em>an integrated system</em>&mdash;and not just a
@@ -385,7 +386,7 @@
 "unelte <a href=\"#nottools\">(2)</a>. Am dezvoltat chiar și un joc de șah, 
"
 "GNU Chess (Șah), pentru că un sistem complet are nevoie și de jocuri."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | By the early 90s we had put together the whole system aside from the
 # | kernel.  We [-were-] {+had+} also [-working on-] {+started+} a kernel, the
 # | <a href=\"/software/hurd/hurd.html\">GNU Hurd</a>, which runs on top of
@@ -419,12 +420,12 @@
 "corespunzător în 2001</a>. Noi ne pregătim acum să distribuim actualul "
 "sistem GNU, cu kernelul GNU Hurd."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Fortunately, [-you-] {+we+} didn't have to wait for the Hurd, because
 # | [-Linux was available.  When Linus-] {+of Linux.  Once+} Torvalds [-wrote
 # | Linux, he filled-] {+freed Linux in 1992, it fit into+} the last major
 # | [-gap.-] {+gap in the GNU system.+}  People could then  [-put-] {+<a
-# | 
href=\"http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>
+# | 
href=\"https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\";>
 # | combine+} Linux [-together-] with the GNU [-system-] {+system</a>+} to
 # | make a complete free [-system:-] {+system &mdash;+} a [-Linux-based-]
 # | version of the GNU [-system; the-] {+system which also contained Linux. 
@@ -449,7 +450,7 @@
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -466,7 +467,7 @@
 "nu sunt în distribuție &mdash; cereți-mi mie (sau proiectului GNU) "
 "informații suplimentare.”"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | [-Putting-]{+Making+} them {+work well+} together [-sounds simple, but
 # | it-] was not a trivial job.  Some GNU components<a
 # | href=\"#somecomponents\">(3)</a> needed substantial change to work with
@@ -507,17 +508,17 @@
 "pentru că noi nu atinsesem încă acel nivel. Oamenii care au dezvoltat "
 "diversele distribuții ale sistemului au făcut o contribuție 
substanțială."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Today there are many different variants of the GNU/Linux system (often "
 "called &ldquo;distros&rdquo;).  Most of them include nonfree programs&mdash;"
@@ -529,25 +530,26 @@
 "FSF supports computer facilities for a few of them."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making a free GNU/Linux distribution is not just a matter of eliminating "
 "various nonfree programs.  Nowadays, the usual version of Linux contains "
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | [-We use Linux-based GNU systems today for most of our work, and we
 # | hope-]{+Whether+} you use [-them too.  But-] {+GNU/Linux or not,+} please
 # | don't confuse the public by using the name &ldquo;Linux&rdquo;
 # | ambiguously.  Linux is the kernel, one of the essential major components
 # | of the system.  The system as a whole is [-more or less-] {+basically+}
 # | the GNU system, with Linux added.  When you're talking about this
-# | combination, please call it &ldquo;GNU/Linux&rdquo;.
+# | combination, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+}
 #, fuzzy
 #| msgid ""
 #| "We use Linux-based GNU systems today for most of our work, and we hope "
@@ -561,7 +563,7 @@
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Noi folosim astăzi sisteme GNU bazate pe Linux pentru cea mai mare parte a "
 "muncii noastre și sperăm că și d-voastră faceți la fel. Dar vă rugăm 
nu "
@@ -570,13 +572,29 @@
 "un întreg este mai mult sau mai puțin sistemul GNU, cu Linux adăugat. 
Când "
 "vorbiți despre această combinație, vă rugăm numiți-o „GNU/Linux”."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
+# | reference, this page and <a href=\"/gnu/the-gnu-project.html\">
+# | http{+s+}://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
+# | you mention Linux, the kernel, and want to add a link for further
+# | reference, <a
+# | [-href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a>-]
+# | {+href=\"https://foldoc.org/linux\";>https://foldoc.org/linux</a>+} is a
+# | good URL to use.
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "Dacă doriți să creeați o legătură despre „GNU/Linux” pentru 
viitoare "
 "referințe, această pagină și <a href=\"/gnu/the-gnu-project.html\"> 
http://";
@@ -585,12 +603,12 @@
 "referințe, <a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> "
 "este un URL bun de folosit."
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 #, fuzzy
 msgid "Postscripts"
 msgstr "Post-scriptum"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Aside from GNU, one other project has independently produced a free
 # | Unix-like operating system.  This system is known as BSD, and it was
 # | developed at UC Berkeley.  It was non[---]free in the 80s, but became free
@@ -618,7 +636,7 @@
 "liber la începutul anilor 90. Un sistem de operare liber care există 
astăzi "
 "este aproape sigur fie o variantă a sistemului GNU, fie un fel de sistem 
BSD."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | People sometimes ask whether BSD too is a version of GNU, like GNU/Linux. 
 # | The BSD developers were inspired to make their code free software by the
 # | example of the GNU Project, and explicit appeals from GNU activists helped
@@ -660,19 +678,20 @@
 "Programatorii BSD nu au scris un kernel și nu l-au adăugat sistemului GNU, "
 "așa că un nume ca GNU/BSD n-ar fi potrivit situației."
 
-#. type: Content of: <div><div><h3>
-# | Notes[-:-]
-#, fuzzy
-#| msgid "Notes:"
-msgid "Notes"
-msgstr "Note"
-
-#. type: Content of: <div><div><ol><li>
-# | <a [-id=\"unexciting\">These-] {+id=\"unexciting\"></a>These+} unexciting
-# | but essential [-components</a>-] {+components+} include the GNU assembler
-# | (GAS) and the linker (GLD), both are now part of the <a
-# | href=\"/software/binutils/\">GNU Binutils</a> package, <a
-# | href=\"/software/tar/\">GNU tar</a>, and {+many+} more.
+# type: Content of: <h4>
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid "Footnotes"
+msgid "Footnotes"
+msgstr "Note de subsol"
+
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"unexciting\">These-]{+These+} unexciting but essential
+# | [-components</a>-] {+components+} include the GNU assembler (GAS) and the
+# | linker (GLD), both are now part of the <a href=\"/software/binutils/\">GNU
+# | Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and {+many+}
+# | more.
 #, fuzzy
 #| msgid ""
 #| "<a id=\"unexciting\">These unexciting but essential components</a> "
@@ -680,23 +699,34 @@
 #| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
 #| "\"/software/tar/\">GNU tar</a>, and more."
 msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\"></a>Aceste componente mai puțin senzaționale dar "
 "esențiale includ asambler-ul GNU (GAS) și linker-ul (GLD), amândouă sunt "
 "acum parte a pachetului <a href=\"/software/binutils/\">GNU Binutils</a>, <a "
 "href=\"/software/tar/\">GNU tar</a>, și altele."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"nottools\"></a>For-]{+For+} instance, The Bourne Again SHell
+# | (BASH), the PostScript interpreter <a
+# | href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the
+# | <a href=\"/software/libc/libc.html\">GNU C library</a> are not programming
+# | tools.  Neither are GNUCash, GNOME, and GNU Chess.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\"></a>De exemplu, Bourne Again SHell-ul (BASH), "
 "interpretorul PostScript <a href=\"/software/ghostscript/ghostscript.html"
@@ -704,33 +734,38 @@
 "C</a> nu sunt unelte de programare. Așa cum nu sunt nici GNUCash, GNOME, și 
"
 "GNU Chess."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"somecomponents\"></a>For-]{+For+} instance, the <a
+# | href=\"/software/libc/libc.html\">GNU C library</a>.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\"></a>De exemplu, <a href=\"/software/libc/libc.html"
 "\">biblioteca GNU C</a>."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
-msgstr ""
-
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
+msgstr ""
+
+#. type: Content of: <div><ol><li>
+msgid ""
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
@@ -784,8 +819,7 @@
 
 #. type: Content of: <div><p>
 #, fuzzy
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002 Richard M. Stallman"
 
@@ -809,6 +843,11 @@
 msgid "Updated:"
 msgstr "Actualizată:"
 
+#, fuzzy
+#~| msgid "Notes:"
+#~ msgid "Notes"
+#~ msgstr "Note"
+
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"

Index: gnu/po/linux-and-gnu.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ru.po,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- gnu/po/linux-and-gnu.ru.po  8 Apr 2021 11:34:36 -0000       1.71
+++ gnu/po/linux-and-gnu.ru.po  30 Aug 2021 13:34:54 -0000      1.72
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-04-08 17:17+0000\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <www-ru-list@gnu.org>\n"
@@ -18,6 +18,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 
 # type: Content of: <title>
 #. type: Content of: <title>
@@ -45,32 +46,39 @@
 "программами, которыми они пользуются, и 
улучшать их."
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "Linux и система GNU"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"https://www.stallman.org/\";>Ричард Столмен</a>"
 
-# type: Content of: <div><blockquote><p>
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"Дополнительные сведения можно найти на 
страницах <a href=\"/gnu/gnu-linux-"
-"faq.html\">&ldquo;Вопросы о GNU/Linux&rdquo;</a> и <a 
href=\"/gnu/why-gnu-"
-"linux.html\">&ldquo;Почему GNU/Linux?&rdquo;</a>"
-
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many computer users run a modified version of <a
+# | href=\"/philosophy/categories.html#TheGNUsystem\">the GNU system</a> every
+# | day, without realizing it.  Through a peculiar turn of events, the version
+# | of GNU which is widely used today is often called [-&ldquo;Linux&rdquo;,-]
+# | {+&ldquo;Linux,&rdquo;+} and many of its users are <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> that it is
+# | basically the GNU system, developed by the <a
+# | href=\"/gnu/gnu-history.html\">GNU Project</a>.
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -83,9 +91,19 @@
 "известно</a>, что в основном это система GNU, 
разработанная <a href=\"/gnu/"
 "gnu-history.html\">проектом GNU</a>."
 
-# type: Content of: <p>
+# type: Content of: <div><blockquote><p>
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"Дополнительные сведения можно найти на 
страницах <a href=\"/gnu/gnu-linux-"
+"faq.html\">&ldquo;Вопросы о GNU/Linux&rdquo;</a> и <a 
href=\"/gnu/why-gnu-"
+"linux.html\">&ldquo;Почему GNU/Linux?&rdquo;</a>"
+
+# type: Content of: <p>
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -107,10 +125,22 @@
 "Linux&rdquo; на самом деле являются 
дистрибутивами GNU/Linux."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Many users do not understand the difference between the kernel, which is
+# | Linux, and the whole system, which they also call [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} The ambiguous use of the name doesn't help people
+# | understand.  These users often think that Linus Torvalds developed the
+# | whole operating system in 1991, with a bit of help.
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -122,7 +152,7 @@
 "систему в 1991&nbsp;&mdash; году, ему только 
немного помогли."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -142,7 +172,7 @@
 "построения системы типа Unix уже под рукой."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free software</"
@@ -164,7 +194,7 @@
 "разработка Linux, GNU была почти завершена."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -181,18 +211,42 @@
 "конкретным программам, которые пришли из 
этого проекта."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If we tried to measure the GNU Project's contribution in this way, what
+# | would we conclude? One CD-ROM vendor found that in their &ldquo;Linux
+# | [-distribution&rdquo;,-] {+distribution,&rdquo;+} <a
+# | href=\"/philosophy/categories.html#GNUsoftware\">GNU software</a> was the
+# | largest single contingent, around 28% of the total source code, and this
+# | included some of the essential major components without which there could
+# | be no system.  Linux itself was about 3%.  (The proportions in 2008 are
+# | similar: in the &ldquo;main&rdquo; repository of gNewSense, Linux is 1.5%
+# | and GNU packages are 15%.)  So if you were going to pick a name for the
+# | system based on who wrote the programs in the system, the most appropriate
+# | single choice would be [-&ldquo;GNU&rdquo;.-] {+&ldquo;GNU.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "If we tried to measure the GNU Project's contribution in this way, what "
+#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
+#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
+#| "\">GNU software</a> was the largest single contingent, around 28% of the "
+#| "total source code, and this included some of the essential major "
+#| "components without which there could be no system.  Linux itself was "
+#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
+#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
+#| "15%.)  So if you were going to pick a name for the system based on who "
+#| "wrote the programs in the system, the most appropriate single choice "
+#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "Если бы мы попытались измерить таким 
образом вклад проекта GNU, к какому бы "
 "выводу мы пришли? Один из поставщиков 
компакт-дисков установил, что в их "
@@ -207,7 +261,7 @@
 "выбором одного компонента было бы 
&ldquo;GNU&rdquo;."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -224,7 +278,7 @@
 "операционную систему типа Unix</em>: GNU."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -254,7 +308,7 @@
 "игры в шахматы, GNU Chess, потому что в полной 
системе игры тоже должны быть."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -270,11 +324,27 @@
 "2001&nbsp;году</a>, но оно далеко не готово для 
общего пользования."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once
+# | Torvalds freed Linux in 1992, it fit into the last major gap in the GNU
+# | system.  People could then <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | combine Linux with the GNU system</a> to make a complete free system
+# | &mdash; a version of the GNU system which also contained Linux.  The
+# | GNU/Linux system, in other words.
+#, fuzzy
+#| msgid ""
+#| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
+#| "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
+#| "system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+#| "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the "
+#| "GNU system</a> to make a complete free system &mdash; a version of the "
+#| "GNU system which also contained Linux.  The GNU/Linux system, in other "
+#| "words."
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -286,7 +356,7 @@
 "которая содержала также Linux; другими 
словами, систему GNU/Linux."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -310,11 +380,25 @@
 "обязательно кто-нибудь выполнил бы."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU
+# | system.  The <a href=\"http{+s+}://fsf.org/\">FSF</a> funded the rewriting
+# | of the Linux-related extensions to the GNU C library, so that now they are
+# | well integrated, and the newest GNU/Linux systems use the current library
+# | release with no changes.  The FSF also funded an early stage of the
+# | development of Debian GNU/Linux.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -327,7 +411,7 @@
 "разработку Debian GNU/Linux."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Today there are many different variants of the GNU/Linux system (often "
 "called &ldquo;distros&rdquo;).  Most of them include nonfree programs&mdash;"
@@ -349,14 +433,31 @@
 "технические ресурсы для нескольких из них
."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Making a free GNU/Linux distribution is not just a matter of eliminating
+# | various nonfree programs.  Nowadays, the usual version of Linux contains
+# | nonfree programs too.  These programs are intended to be loaded into I/O
+# | devices when the system starts, and they are included, as long series of
+# | numbers, in the \"source code\" of Linux.  Thus, maintaining free
+# | GNU/Linux distributions now entails maintaining a <a
+# | href=\"http{+s+}://directory.fsf.org/project/linux\"> free version of
+# | Linux</a> too.
+#, fuzzy
+#| msgid ""
+#| "Making a free GNU/Linux distribution is not just a matter of eliminating "
+#| "various nonfree programs.  Nowadays, the usual version of Linux contains "
+#| "nonfree programs too.  These programs are intended to be loaded into I/O "
+#| "devices when the system starts, and they are included, as long series of "
+#| "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/"
+#| "Linux distributions now entails maintaining a <a href=\"http://directory.";
+#| "fsf.org/project/linux\"> free version of Linux</a> too."
 msgid ""
 "Making a free GNU/Linux distribution is not just a matter of eliminating "
 "various nonfree programs.  Nowadays, the usual version of Linux contains "
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 "Чтобы создать свободный дистрибутив 
GNU/Linux, недостаточно просто исключить "
@@ -369,13 +470,26 @@
 "\">свободной версии Linux</a>."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Whether you use GNU/Linux or not, please don't confuse the public by using
+# | the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the
+# | essential major components of the system.  The system as a whole is
+# | basically the GNU system, with Linux added.  When you're talking about
+# | this combination, please call it [-&ldquo;GNU/Linux&rdquo;.-]
+# | {+&ldquo;GNU/Linux.&rdquo;+}
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Пользуетесь вы GNU/Linux или нет, пожалуйста, 
не вводите общественность в "
 "заблуждение двусмысленным употреблением 
названия &ldquo;Linux&rdquo;. "
@@ -385,13 +499,29 @@
 "Linux&rdquo;."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
+# | reference, this page and <a href=\"/gnu/the-gnu-project.html\">
+# | http{+s+}://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
+# | you mention Linux, the kernel, and want to add a link for further
+# | reference, <a
+# | [-href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a>-]
+# | {+href=\"https://foldoc.org/linux\";>https://foldoc.org/linux</a>+} is a
+# | good URL to use.
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "Если вы хотите сослаться для справок на 
&ldquo;GNU/Linux&rdquo;, эта "
 "страница и <a href=\"/gnu/the-gnu-project.html\"> 
http://www.gnu.org/gnu/the-";
@@ -400,12 +530,12 @@
 "linux\"> http://foldoc.org/foldoc/linux</a>&nbsp;&mdash; хороший 
адрес для "
 "этого."
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr "Дополнения"
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Aside from GNU, one other project has independently produced a free Unix-"
 "like operating system.  This system is known as BSD, and it was developed at "
@@ -423,7 +553,7 @@
 "системы BSD."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -445,18 +575,28 @@
 "добавили ядро в систему GNU, разработав его, 
так что название типа &ldquo;"
 "GNU/BSD&rdquo; не подошло бы к ситуации<a 
href=\"#gnubsd\">(5)</a>."
 
-# type: Content of: <h3>
-#. type: Content of: <div><div><h3>
-msgid "Notes"
+# type: Content of: <h4>
+#. type: Content of: <div><h3>
+msgid "Footnotes"
 msgstr "Примечания"
 
 # type: Content of: <ol><li>
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"unexciting\"></a>These-]{+These+} unexciting but essential
+# | components include the GNU assembler (GAS) and the linker (GLD), both are
+# | now part of the <a href=\"/software/binutils/\">GNU Binutils</a> package,
+# | <a href=\"/software/tar/\">GNU tar</a>, and many more.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"unexciting\"></a>These unexciting but essential components "
+#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
+#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
+#| "\"/software/tar/\">GNU tar</a>, and many more."
+msgid ""
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\"></a>Эти не впечатляющие, но 
существенные компоненты "
 "включают ассемблер (GAS) и редактор связей 
(GLD), которые сейчас оба входят "
@@ -464,13 +604,24 @@
 "software/tar/\">GNU tar</a>, и другие."
 
 # type: Content of: <ol><li>
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"nottools\"></a>For-]{+For+} instance, The Bourne Again SHell
+# | (BASH), the PostScript interpreter <a
+# | href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the
+# | <a href=\"/software/libc/libc.html\">GNU C library</a> are not programming
+# | tools.  Neither are GNUCash, GNOME, and GNU Chess.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\"></a>Например, Bourne Again SHell (BASH), 
интерпретатор "
 "языка PostScript <a href=\"/software/ghostscript/ghostscript.html"
@@ -479,23 +630,42 @@
 "GNU Chess."
 
 # type: Content of: <ol><li>
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"somecomponents\"></a>For-]{+For+} instance, the <a
+# | href=\"/software/libc/libc.html\">GNU C library</a>.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\"></a>Например, <a 
href=\"/software/libc/libc.html"
 "\">библиотека C GNU</a>."
 
 # type: Content of: <ol><li>
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"newersystems\"></a>Since-]{+Since+} that was written, a
+# | nearly-all-free Windows-like system has been developed, but technically it
+# | is not at all like GNU or Unix, so it doesn't really affect this issue. 
+# | Most of the kernel of Solaris has been made free, but if you wanted to
+# | make a free system out of that, aside from replacing the missing parts of
+# | the kernel, you would also need to put it into GNU or BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\"></a>С тех пор, как были написаны 
эти строки, была "
 "разработана почти полностью свободная 
операционная система, подобная "
@@ -506,15 +676,31 @@
 "обратить ее в GNU или BSD."
 
 # type: Content of: <ol><li>
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"gnubsd\"></a>On-]{+On+} the other hand, in the years since this
+# | article was written, the GNU C Library has been ported to several versions
+# | of the BSD kernel, which made it straightforward to combine the GNU system
+# | with that kernel.  Just as with GNU/Linux, these are indeed variants of
+# | GNU, and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD
+# | depending on the kernel of the system.  Ordinary users on typical desktops
+# | can hardly distinguish between GNU/Linux and GNU/*BSD.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
+#| "was written, the GNU C Library has been ported to several versions of the "
+#| "BSD kernel, which made it straightforward to combine the GNU system with "
+#| "that kernel.  Just as with GNU/Linux, these are indeed variants of GNU, "
+#| "and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD "
+#| "depending on the kernel of the system.  Ordinary users on typical "
+#| "desktops can hardly distinguish between GNU/Linux and GNU/*BSD."
+msgid ""
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a id=\"gnubsd\"></a>С другой стороны, за годы, 
прошедшие со времени "
 "написания этой статьи, библиотека C GNU была 
перенесена на несколько версий "
@@ -577,8 +763,13 @@
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+# | Copyright &copy; 1997-2002, [-2007, 2014-2017,-] {+2005, 2008,+} 2019,
+# | 2021 Richard [-M.-] Stallman
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. "
+#| "Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. "
 "Stallman<br />Copyright &copy; 1999 Сергей Короп (translation)<br 
/"
@@ -607,6 +798,10 @@
 msgid "Updated:"
 msgstr "Обновлено:"
 
+# type: Content of: <h3>
+#~ msgid "Notes"
+#~ msgstr "Примечания"
+
 # type: Content of: <p>
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"

Index: gnu/po/linux-and-gnu.sq.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.sq.po,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- gnu/po/linux-and-gnu.sq.po  31 May 2021 11:30:24 -0000      1.82
+++ gnu/po/linux-and-gnu.sq.po  30 Aug 2021 13:34:54 -0000      1.83
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-05-01 11:33+0300\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: \n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "X-Generator: Poedit 2.4.2\n"
 
 #. type: Content of: <title>
@@ -38,28 +39,29 @@
 "Unix-in, që përdoruesit e kompjuterit të jenë të lirë të shkëmbejnë 
dhe të "
 "përmirësojnë software-in që përdorin."
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "Linux-i dhe Sistemi GNU"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "nga <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"Për më tepër të dhëna shihni dhe <a href=\"/gnu/gnu-linux-faq.html\">FAQ 
mbi "
-"GNU/Linux</a>, dhe <a href=\"/gnu/why-gnu-linux.html\">Pse GNU/Linux?</a>"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -74,6 +76,14 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"Për më tepër të dhëna shihni dhe <a href=\"/gnu/gnu-linux-faq.html\">FAQ 
mbi "
+"GNU/Linux</a>, dhe <a href=\"/gnu/why-gnu-linux.html\">Pse GNU/Linux?</a>"
+
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -94,10 +104,17 @@
 "Linux.  Krejt të ashtuquajturat shpërndarje &ldquo;Linux&rdquo; janë "
 "përnjëmend GNU/Linux."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -108,7 +125,7 @@
 "përdorues shpesh mendojnë se Linus Torvalds-i zhvilloi krejt sistemin "
 "operativ më 1991, me pakëz ndihmë."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -127,7 +144,7 @@
 "dhe u doli se (pa ndonjë arsye të veçantë) shumica e gjërave të 
nevojshme "
 "për të ndërtuar një sistem të ngjashëm me Unix-in qenë gati që më 
parë."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free software</"
@@ -148,7 +165,7 @@
 "përvijon po ashtu disa nga planet origjinale për sistemin GNU. Në kohën 
që "
 "Linux-i zuri fill, GNU thuajse kish përfunduar."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -165,18 +182,31 @@
 "kuptueshme të matet kontributi në këtë lloj projektesh sipas programeve 
që "
 "erdhën nga projektet."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "If we tried to measure the GNU Project's contribution in this way, what "
+#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
+#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
+#| "\">GNU software</a> was the largest single contingent, around 28% of the "
+#| "total source code, and this included some of the essential major "
+#| "components without which there could be no system.  Linux itself was "
+#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
+#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
+#| "15%.)  So if you were going to pick a name for the system based on who "
+#| "wrote the programs in the system, the most appropriate single choice "
+#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "Po të provonim të matnim kontributin e Projektit GNU me këtë rrugë, 
ç’do të "
 "na dilte? Një shitës CD-ROM-esh pa se në &ldquo;shpërndarjen e tij "
@@ -189,7 +219,7 @@
 "sistemin, bazuar në atë se kush shkrojti programet e sistemit, zgjedhja e "
 "vetme më e përshtatshme do të ishte &ldquo;GNU&rdquo;."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -205,7 +235,7 @@
 "përpunues tekstesh, edhe pse ndërtuam një të tillë.  Projekti u hartua 
për "
 "të ndërtuar <em>një sistem krejt të lirë të ngjashëm me Unix-in</em>: 
GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -234,7 +264,7 @@
 "mjete <a href=\"#nottools\">(2)</a>.  Hartuam madje edhe një lojë shahu, "
 "Shah GNU, ngaqë një sistem i plotë lyp edhe lojëra."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -250,11 +280,20 @@
 "Hurd zuri të punonte në mënyrë të besueshme më 2001</a>, por ka ende 
shumë "
 "rrugë derisa të jetë gati për përdorim të përgjithshëm."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
+#| "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
+#| "system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+#| "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the "
+#| "GNU system</a> to make a complete free system &mdash; a version of the "
+#| "GNU system which also contained Linux.  The GNU/Linux system, in other "
+#| "words."
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -267,7 +306,7 @@
 "version të sistemit GNU që përmbante gjithashtu Linux.  Me fjalë të 
tjera, "
 "sistemin GNU/Linux."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -289,11 +328,19 @@
 "kryen shumë punë me rëndësi.  Por qe punë e cila, për nga natyra e vet, 
"
 "sigurisht që do të bëhej nga dikush."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -305,7 +352,7 @@
 "pa e ndryshuar.  FSF-ja financoi gjithashtu një fazë të hershme të "
 "zhvillimit të  Debian GNU/Linux-it."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Today there are many different variants of the GNU/Linux system (often "
 "called &ldquo;distros&rdquo;).  Most of them include nonfree programs&mdash;"
@@ -326,14 +373,23 @@
 "distros.html\">shpërndarje GNU/Linux krejtësisht të lira</a>.  FSF-ja 
mbulon "
 "infrastrukturën kompjuterike për pak prej tyre."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Making a free GNU/Linux distribution is not just a matter of eliminating "
+#| "various nonfree programs.  Nowadays, the usual version of Linux contains "
+#| "nonfree programs too.  These programs are intended to be loaded into I/O "
+#| "devices when the system starts, and they are included, as long series of "
+#| "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/"
+#| "Linux distributions now entails maintaining a <a href=\"http://directory.";
+#| "fsf.org/project/linux\"> free version of Linux</a> too."
 msgid ""
 "Making a free GNU/Linux distribution is not just a matter of eliminating "
 "various nonfree programs.  Nowadays, the usual version of Linux contains "
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 "Bërja e një shpërndarjeje GNU/Linux të lirë nuk është thjesht punë 
heqjeje "
@@ -344,13 +400,20 @@
 "lira GNU/Linux tani nënkupton po aq pasjen e <a href=\"http://directory.fsf.";
 "org/project/linux\"> një versioni të lirë të Linux-it</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "E përdorni a jo GNU/Linux-in, ju lutemi, mos e ngatërroni publikun duke "
 "përdorur emrin &ldquo;Linux&rdquo; në mënyrë të dykuptimtë.  Linux 
është "
@@ -358,13 +421,21 @@
 "tërë është në fakt sistemi GNU, me Linux-in të shtuar aty.  Kur flisni 
rreth "
 "kësaj ndërthurje, ju lutemi, quajeni &ldquo;GNU/Linux&rdquo;."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "Nëse doni të krijoni një lidhje te &ldquo;GNU/Linux&rdquo; për referencë 
të "
 "mëtejshme, kjo faqe dhe <a href=\"/gnu/the-gnu-project.html\"> http://www.";
@@ -373,11 +444,11 @@
 "mëtejshme, <a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> "
 "është një URL e mirë për ta përdorur."
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr "PS"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Aside from GNU, one other project has independently produced a free Unix-"
 "like operating system.  This system is known as BSD, and it was developed at "
@@ -393,7 +464,7 @@
 "\"#newersystems\">(4)</a> janë, pothuaj me siguri, ose variante të sistemit 
"
 "GNU, ose ndonjë lloj sistemi BSD."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -416,51 +487,74 @@
 "GNU, dhe ndonjë emër si GNU/BSD nuk do të pasqyronte gjendjen e 
njëmendtë.<a "
 "href=\"#gnubsd\">(5)</a>"
 
-#. type: Content of: <div><div><h3>
-msgid "Notes"
-msgstr "Shënime"
-
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+#. type: Content of: <div><h3>
+msgid "Footnotes"
+msgstr "Poshtëshënime"
+
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"unexciting\"></a>These unexciting but essential components "
+#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
+#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
+#| "\"/software/tar/\">GNU tar</a>, and many more."
+msgid ""
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\"></a>Këta përbërës të pabujë, por thelbësorë, 
përfshijnë "
 "asemblerin GNU (GAS) dhe linker-in (GLD), që të dy tani pjesë e paketës 
<a "
 "href=\"/software/binutils/\">GNU Binutils</a>, <a href=\"/software/tar/"
 "\">GNU tar</a>, dhe shumë të tjerë."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\"></a>Sa për shembull, The Bourne Again SHell (BASH), "
 "interpretuesi PostScript <a href=\"/software/ghostscript/ghostscript.html"
 "\">Ghostscript</a>, dhe <a href=\"/software/libc/libc.html\">libraria GNU C</"
 "a> nuk janë mjete programimi.  As GNUCash, as GNOME, dhe as GNU Chess."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\"></a>Sa për shembull, <a href=\"/software/libc/libc."
 "html\">libraria GNU C</a>."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\"></a>Pas shkrimit të këtij artikulli, u zhvillua një 
"
 "sistem thuajse-krejt-i-lirë, i ngjashëm me Windows-in, por teknikisht nuk "
@@ -470,15 +564,24 @@
 "mungojnë te kerneli, do t’ju duhej edhe ta bënit të hynte te GNU-ja ose 
BSD-"
 "ja."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
+#| "was written, the GNU C Library has been ported to several versions of the "
+#| "BSD kernel, which made it straightforward to combine the GNU system with "
+#| "that kernel.  Just as with GNU/Linux, these are indeed variants of GNU, "
+#| "and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD "
+#| "depending on the kernel of the system.  Ordinary users on typical "
+#| "desktops can hardly distinguish between GNU/Linux and GNU/*BSD."
+msgid ""
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a id=\"gnubsd\"></a>Nga ana tjetër, përgjatë viteve, qëkur u shkrua ky "
 "artikull, Libraria C GNU është përshtatur për disa versione të kernelit 
BSD, "
@@ -535,8 +638,11 @@
 "standards/README.translations.html\">README për përkthimet</a>."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. "
+#| "Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Të drejta kopjimi &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. "
 "Stallman"
@@ -560,3 +666,6 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "U përditësua më:"
+
+#~ msgid "Notes"
+#~ msgstr "Shënime"

Index: gnu/po/linux-and-gnu.sr.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.sr.po,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- gnu/po/linux-and-gnu.sr.po  31 May 2021 09:06:18 -0000      1.52
+++ gnu/po/linux-and-gnu.sr.po  30 Aug 2021 13:34:54 -0000      1.53
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2009-10-17 17:55+0200\n"
 "Last-Translator: Strahinya Radich <vilinkamen@mail.ru>\n"
 "Language-Team: Serbian <www-sr-dev@lists.gnu.org>\n"
@@ -41,32 +41,32 @@
 "корисницима рачунара пружили слободу 
дељења и побољшавања софтвера који "
 "користе."
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "Линукс и систем ГНУ"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 #, fuzzy
 #| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "од <a href=\"http://www.stallman.org/\";>Ричарда 
Сталмана</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"Да бисте сазнали више о овој теми, можете 
прочитати и <a href=\"/gnu/gnu-"
-"linux-faq.html\">ЧПП ГНУ-а са Линуксом</a>, као и <a 
href=\"/gnu/why-gnu-"
-"linux.html\">Зашто ГНУ са Линуксом?</a>"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -81,6 +81,15 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"Да бисте сазнали више о овој теми, можете 
прочитати и <a href=\"/gnu/gnu-"
+"linux-faq.html\">ЧПП ГНУ-а са Линуксом</a>, као и <a 
href=\"/gnu/why-gnu-"
+"linux.html\">Зашто ГНУ са Линуксом?</a>"
+
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -100,10 +109,17 @@
 "Линуксом. Све дистрибуције такозваног 
„Линукса“ су у ствари дистрибуције ГНУ-"
 "а са Линуксом."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -113,7 +129,7 @@
 "назива не побољшава разумевање ствари. 
Такви корисници обично мисле да је "
 "Линус Торвалдс развио цео оперативни 
систем 1991. уз незнатну помоћ других."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -131,7 +147,7 @@
 "језгро допуни, и открили да је (без икаквог 
конкретног повода) већина ствари "
 "које су неопходне униксоликом систему већ 
била доступна."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free software</"
@@ -151,7 +167,7 @@
 "илуструје неке од првобитних планова за 
систем ГНУ. Цео систем је био скоро "
 "готов до времена када је започет Линукс."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -169,18 +185,31 @@
 "доприноса који овакви пројекти доносе, 
кроз појединачне програме који су "
 "развијени у оквиру пројекта."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "If we tried to measure the GNU Project's contribution in this way, what "
+#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
+#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
+#| "\">GNU software</a> was the largest single contingent, around 28% of the "
+#| "total source code, and this included some of the essential major "
+#| "components without which there could be no system.  Linux itself was "
+#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
+#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
+#| "15%.)  So if you were going to pick a name for the system based on who "
+#| "wrote the programs in the system, the most appropriate single choice "
+#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "Шта бисмо закључили ако бисмо покушали да 
оценимо допринос пројекта ГНУ на "
 "овај начин? Један продавац система на 
<em>CD-ROM</em>-ова је открио да је у "
@@ -193,7 +222,7 @@
 "ко је написао програме који чине тај 
систем, најбоља варијанта, која би се "
 "ограничила на један извор, била би „ГНУ“."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -210,7 +239,7 @@
 "уређивач. Пројекат ГНУ је покренут да 
изгради <em>потпун слободни униксолики "
 "систем</em>: ГНУ."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -238,7 +267,7 @@
 "a>. Чак смо развили и игру шаха, ГНУ-ов шах, 
јер су за потпун систем "
 "неопходне и добре игре."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -262,7 +291,7 @@
 # | {+system &mdash;+} a [-Linux-based-] version of the GNU [-system; the-]
 # | {+system which also contained Linux.  The+} GNU/Linux system, [-for
 # | short.-] {+in other words.+}
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
@@ -274,7 +303,7 @@
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -286,7 +315,7 @@
 "потпун слободни систем: систем ГНУ 
заснован на језгру Линукс, или, краће, "
 "систем ГНУ са Линуксом."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -307,11 +336,19 @@
 "градили разне дистрибуције система су нам 
веома помогли у основном раду. Али "
 "тај посао, по природи ствари, је неко 
засигурно морао да обави."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -337,7 +374,7 @@
 # | also <a href=\"/distros/distros.html\">completely free GNU/Linux
 # | distros</a>.  The FSF supports computer facilities for [-<a
 # | href=\"http://gnewsense.org/\";>gNewSense</a>.-] {+a few of them.+}
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "Today there are many different variants of the GNU/Linux system (often "
@@ -367,14 +404,23 @@
 "дистрибуције ГНУ-а са Линуксом</a>. ЗСС 
обезбеђује рачунарске ресурс <a href="
 "\"http://gnewsense.org/\";><em>gNewSense</em>-у</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Making a free GNU/Linux distribution is not just a matter of eliminating "
+#| "various nonfree programs.  Nowadays, the usual version of Linux contains "
+#| "nonfree programs too.  These programs are intended to be loaded into I/O "
+#| "devices when the system starts, and they are included, as long series of "
+#| "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/"
+#| "Linux distributions now entails maintaining a <a href=\"http://directory.";
+#| "fsf.org/project/linux\"> free version of Linux</a> too."
 msgid ""
 "Making a free GNU/Linux distribution is not just a matter of eliminating "
 "various nonfree programs.  Nowadays, the usual version of Linux contains "
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 "Прављење слободне дистрибуције ГНУ-а са 
Линуксом није само ствар елиминисања "
@@ -385,13 +431,20 @@
 "и одржавање <a 
href=\"http://directory.fsf.org/project/linux\";>слободне "
 "верзије Линукса</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Без обзира на то да ли користите ГНУ са 
Линуксом или не, молимо вас да не "
 "збуњујете јавност употребљавајући 
двосмислени назив „Линукс“. Линукс је "
@@ -399,13 +452,21 @@
 "систем ГНУ, са додатком језгра Линукс. 
Када причате о овој комбинацији, "
 "молимо вас да је називате „ГНУ-ом са 
Линуксом“."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "Уколико негде желите да поменете везу (у 
смислу веб странице) ка „ГНУ-у са "
 "Линуксом“, добри избори су ова страница и 
страница <a href=\"/gnu/the-gnu-"
@@ -414,13 +475,13 @@
 "добар УРЛ је <a 
href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a>."
 
 # | [-Addendum-]{+Postscripts+}
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 #, fuzzy
 #| msgid "Addendum"
 msgid "Postscripts"
 msgstr "Додатак"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Aside from GNU, one other project has independently produced a free Unix-"
 "like operating system.  This system is known as BSD, and it was developed at "
@@ -436,7 +497,7 @@
 "<a href=\"#newersystems\">(4)</a> је скоро сигурно 
варијанта система ГНУ или "
 "система БСД."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -458,18 +519,25 @@
 "нису написали језгро и додали га систему 
ГНУ, па стога називи као што је ГНУ "
 "са БСД-ом не би били одговарајући.<a 
href=\"#gnubsd\">(5)</a>"
 
-#. type: Content of: <div><div><h3>
+# type: Content of: <h3>
+#. type: Content of: <div><h3>
+#, fuzzy
+#| msgid "Footnotes"
+msgid "Footnotes"
+msgstr "Фусноте"
+
+#. type: Content of: <div><ol><li>
 #, fuzzy
-#| msgid "Notes:"
-msgid "Notes"
-msgstr "Фусноте:"
-
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+#| msgid ""
+#| "<a id=\"unexciting\"></a>These unexciting but essential components "
+#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
+#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
+#| "\"/software/tar/\">GNU tar</a>, and many more."
+msgid ""
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\"></a>Ови незанимљиви али кључни 
делови укључују ГНУ-ов "
 "асемблер, ГАС и повезивач, <em>GLD</em>, а и 
један и други су делови пакета "
@@ -477,13 +545,19 @@
 "em>)</a>, <a href=\"/software/tar/\">ГНУ-овог архивара 
<em>tar</em></a>, и "
 "других."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\"></a>На пример, Бурнова љуска Баш 
(<em>The Bourne Again "
 "SHell — BASH</em>), интерпретатор ПостСкрипта <a 
href=\"/software/"
@@ -492,22 +566,33 @@
 "програмерски алати, као што то нису ни 
програми ГНУКеш (<em>GNUCash</em>), "
 "Гном и ГНУ-ов шах."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\"></a>На пример, <a 
href=\"/software/libc/libc.html"
 "\">ГНУ-ова библиотека за Це</a>."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\"></a>Од када је ово написано, 
изграђује се скоро-"
 "слободни виндовсолики систем, али тех
нички он уопште није попут ГНУ-а или "
@@ -524,7 +609,7 @@
 # | GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the system. 
 # | Ordinary users on typical desktops can hardly distinguish between
 # | GNU/Linux and GNU/*BSD.
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
 #, fuzzy
 #| msgid ""
 #| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
@@ -535,13 +620,13 @@
 #| "system.  Ordinary users on typical desktops can hardly distinguish "
 #| "between GNU/Linux and GNU/*BSD."
 msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a id=\"gnubsd\"></a>Са друге стране, у годинама 
које су уследиле после "
 "писања овог чланка, ГНУ-ова библиотека за 
Це је пренесена и на језгро БСД-а, "
@@ -606,8 +691,7 @@
 
 #. type: Content of: <div><p>
 #, fuzzy
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007 Richard M. Stallman"
 
@@ -637,6 +721,11 @@
 msgid "Updated:"
 msgstr "Ажурирано:"
 
+#, fuzzy
+#~| msgid "Notes:"
+#~ msgid "Notes"
+#~ msgstr "Фусноте:"
+
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"

Index: gnu/po/linux-and-gnu.ta.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.ta.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gnu/po/linux-and-gnu.ta.po  7 Apr 2021 18:04:09 -0000       1.9
+++ gnu/po/linux-and-gnu.ta.po  30 Aug 2021 13:34:54 -0000      1.10
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+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"
@@ -35,52 +35,30 @@
 "use."
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 # | Linux and the GNU [-Project-] {+System+}
 #, fuzzy
 #| msgid "Linux and the GNU Project"
 msgid "Linux and the GNU System"
 msgstr "லினக்ஸும் குனு திட்டமும்"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 # | by <a href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a>
 #, fuzzy
 #| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "ஆசிரியர்: <a 
href=\"http://www.stallman.org/\";>ரிச்சர்ட் எம். 
ஸ்டால்மேன்</a>"
 
-#. type: Content of: <div><div><p>
-# | [-To learn-]{+For+} more [-about this issue, you can-] {+information see+}
-# | also [-read our-] {+the+} <a href=\"/gnu/gnu-linux-faq.html\">GNU/Linux
-# | FAQ</a>, [-our page on-] {+and+} <a href=\"/gnu/why-gnu-linux.html\">Why
-# | GNU/Linux?</a> [-and our page on <a
-# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
-# | Heard of GNU</a>.-]
-#, fuzzy
-#| msgid ""
-#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
-#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
-#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/gnu-users-"
-#| "never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</a>."
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"இப்பேதம் குறித்து மேலும் அ
றிய <a 
href=\"/gnu/gnu-linux-faq.html\">குனு/லினக்ஸ் "
-"கேள்வி பதில்</a> பகுதியையும், <a 
href=\"/gnu/why-gnu-linux.html\">ஏன் குனு/லினக்ஸ்?"
-"</a> பக்கத்தையும் <a 
href=\"/gnu/gnu-users-never-heard-of-gnu.html\">குனுவினைப் "
-"பற்றி கேள்விப் பட்டிராத 
குனு பயனர்கள்</a> ஆகியப் 
பக்கங்களையும் வாசிக்கலாம்."
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Many computer users run a modified version of <a
 # | href=\"/philosophy/categories.html#TheGNUsystem\">the GNU system</a> every
 # | day, without realizing it.  Through a peculiar turn of events, the version
-# | of GNU which is widely used today is [-more-] often [-known as-]
-# | {+called+} &ldquo;Linux&rdquo;, and many {+of its+} users are {+<a
-# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">+} not [-aware of-]
-# | {+aware</a> that it is basically+} the [-extent of its connection with-]
-# | {+GNU system, developed by+} the <a href=\"/gnu/gnu-history.html\">GNU
-# | Project</a>.
+# | of GNU which is widely used today is [-more-] often [-known as
+# | &ldquo;Linux&rdquo;,-] {+called &ldquo;Linux,&rdquo;+} and many {+of its+}
+# | users are {+<a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">+} not
+# | [-aware of-] {+aware</a> that it is basically+} the [-extent of its
+# | connection with-] {+GNU system, developed by+} the <a
+# | href=\"/gnu/gnu-history.html\">GNU Project</a>.
 #, fuzzy
 #| msgid ""
 #| "Many computer users run a modified version of <a href=\"/philosophy/"
@@ -93,7 +71,7 @@
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -106,6 +84,28 @@
 "பெரும்பாலான பயனர்கள் அ
றியாமலே உள்ளனர்."
 
 #. type: Content of: <div><div><p>
+# | [-To learn-]{+For+} more [-about this issue, you can-] {+information see+}
+# | also [-read our-] {+the+} <a href=\"/gnu/gnu-linux-faq.html\">GNU/Linux
+# | FAQ</a>, [-our page on-] {+and+} <a href=\"/gnu/why-gnu-linux.html\">Why
+# | GNU/Linux?</a> [-and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.-]
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can also read our <a href=\"/gnu/gnu-"
+#| "linux-faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/why-gnu-"
+#| "linux.html\">Why GNU/Linux?</a> and our page on <a href=\"/gnu/gnu-users-"
+#| "never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</a>."
+msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"இப்பேதம் குறித்து மேலும் அ
றிய <a 
href=\"/gnu/gnu-linux-faq.html\">குனு/லினக்ஸ் "
+"கேள்வி பதில்</a> பகுதியையும், <a 
href=\"/gnu/why-gnu-linux.html\">ஏன் குனு/லினக்ஸ்?"
+"</a> பக்கத்தையும் <a 
href=\"/gnu/gnu-users-never-heard-of-gnu.html\">குனுவினைப் "
+"பற்றி கேள்விப் பட்டிராத 
குனு பயனர்கள்</a> ஆகியப் 
பக்கங்களையும் வாசிக்கலாம்."
+
+#. type: Content of: <div><p>
 # | There really is a Linux, and these people are using it, but it is [-not-]
 # | {+just a part of+} the [-operating system.-] {+system they use.+}  Linux
 # | is the kernel: the program in the system that allocates the machine's
@@ -144,13 +144,14 @@
 "முடியும். சாதாரணமாக லினக்ஸ் 
குனு இயங்கு தளத்துடன் 
பயன்படுத்தப் படுகிறது. 
முழுமையான "
 "அமைப்பென்பது அடிப்படையில் 
குனு. லினக்ஸ் அதன் கருவாகச் 
செயல்படுகின்றது."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Many users [-are-] {+do+} not [-fully aware of-] {+understand+} the
 # | [-distinction-] {+difference+} between the kernel, which is Linux, and the
-# | whole system, which they also call &ldquo;Linux&rdquo;.  The ambiguous use
-# | of the name doesn't [-promote understanding.-] {+help people understand.+}
-# |  These users often think that Linus Torvalds developed the whole operating
-# | system in 1991, with a bit of help.
+# | whole system, which they also call [-&ldquo;Linux&rdquo;.-]
+# | {+&ldquo;Linux.&rdquo;+} The ambiguous use of the name doesn't [-promote
+# | understanding.-] {+help people understand.+}  These users often think that
+# | Linus Torvalds developed the whole operating system in 1991, with a bit of
+# | help.
 #, fuzzy
 #| msgid ""
 #| "Many users are not fully aware of the distinction between the kernel, "
@@ -160,7 +161,7 @@
 #| "whole operating system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -170,7 +171,7 @@
 "இப் பெயர் பிரயோகம் புரிதலை 
பேணவில்லை. இப்பயனர்கள் அ
னைவரும் சிறு உதவியுடன் 1991 ல் 
லைனஸ் "
 "டோர்வால்ட்ஸ் முழு இயங்கு 
தளத்தினையும் உருவாக்கியதாக 
நினைத்துக் 
கொண்டிருக்கிறார்கள்."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -187,7 +188,7 @@
 "தேடியதாகவும்,அங்ஙனம் 
யுனிக்ஸ் போறதொரு இயங்கு 
தளத்திற்குத் தேவையான அ
னைத்தும் ஏற்கனவே "
 "கிடைத்ததைக் (எந்தவொரு 
காரணமும் இல்லாமல்) 
கண்டெடுத்ததாகவும் பலர் 
நம்புகின்றனர்."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | What they found was no accident&mdash;it was the not-quite-complete GNU
 # | system.  The available <a href=\"/philosophy/free-sw.html\">free
 # | software</a> added up to a complete system because the GNU Project had
@@ -228,7 +229,7 @@
 "குறித்து 
விரித்துரைக்கின்றது. 
லினக்ஸ் இயற்றப் பட்டபொழுது 
குனு கிட்டத்தட்ட நிறைவினை "
 "எட்டியிருந்தது."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -244,10 +245,10 @@
 "(எக்ஸ் சாளர அமைப்பு). 
இத்தகையத் திட்டங்களை அ
த்திட்டங்களிலிருந்து வரக் 
கூடிய குறிப்பிட்ட "
 "நிரல்களைக் கொண்டு 
மதிப்பிடுவது இயற்கையானது."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | If we tried to measure the GNU Project's contribution in this way, what
 # | would we conclude? One CD-ROM vendor found that in their &ldquo;Linux
-# | distribution&rdquo;, <a
+# | [-distribution&rdquo;,-] {+distribution,&rdquo;+} <a
 # | href=\"/philosophy/categories.html#GNUsoftware\">GNU software</a> was the
 # | largest single contingent, around 28% of the total source code, and this
 # | included some of the essential major components without which there could
@@ -255,7 +256,7 @@
 # | similar: in the &ldquo;main&rdquo; repository of gNewSense, Linux is 1.5%
 # | and GNU packages are 15%.)+}  So if you were going to pick a name for the
 # | system based on who wrote the programs in the system, the most appropriate
-# | single choice would be &ldquo;GNU&rdquo;.
+# | single choice would be [-&ldquo;GNU&rdquo;.-] {+&ldquo;GNU.&rdquo;+}
 #, fuzzy
 #| msgid ""
 #| "If we tried to measure the GNU Project's contribution in this way, what "
@@ -270,14 +271,14 @@
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "குனு திட்டத்தின் 
பங்களிப்பினை இங்ஙனம் நாம் அ
ளவிட்டால் எத்தகையதொரு 
முடிவிற்கு நம்மால் வர "
 "இயலும்? வட்டொன்றினை 
விநியோகிக்கும் ஒருவர் 
தங்கள் “லினக்ஸ் வழங்களில்” 
ஒட்டுமொத்த மூல "
@@ -288,7 +289,7 @@
 "என்பதை வைத்து தாங்கள் ஒரு 
பெயரினைத் தேர்வு செய்யப் 
போகின்றீர்கள் என்றால் 
மிகவும் பொருத்தமானத் "
 "தேர்வு “குனு” வாகத்தான் 
இருக்கும்."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | But [-we don't think-] that is {+not+} the [-right-] {+deepest+} way to
 # | consider the question.  The GNU Project was not, is not, a project to
 # | develop specific software packages.  It was not a project <a
@@ -319,7 +320,7 @@
 "விழைந்த திட்டமுமல்ல. இருந்த 
பொழுதும் ஒன்றை நாங்கள் 
உருவாக்கினோம். குனு 
திட்டத்தின் இலக்கு "
 "குனு என்ற முழுமையான கட்டற்ற 
யுனிக்ஸ் போன்றதொரு இயங்கு 
தளத்தினை உருவாக்குவது."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Many people have made major contributions to the free software in the
 # | system, and they all deserve [-credit.-] {+credit for their software.+} 
 # | But the reason it is <em>an integrated system</em>&mdash;and not just a
@@ -374,7 +375,7 @@
 "இயற்றினோம். நாங்கள் செஸ் 
விளையாட்டு ஒன்றினையும் 
உருவாக்கினோம். ஏனெனில் 
முழுமையான "
 "அமைப்பொன்றுக்கு நல்ல 
விளையாட்டுக்களும் தேவை."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | By the early 90s we had put together the whole system aside from the
 # | [-kernel (and we were-] {+kernel.  We had+} also [-working on-]
 # | {+started+} a kernel, the <a href=\"/software/hurd/hurd.html\">GNU
@@ -408,11 +409,27 @@
 "and-linux.html\">குனு ஹர்ட் 2001 லிருந்து 
நம்பகத்தன்மையுடன் 
பணிபுரியத் துவங்கியது</"
 "a>. குனு ஹர்ட்டினைக் கொண்ட 
குனு அமைப்பினை வெளியிட 
நாங்கள் ஆயத்தமாகி 
வருகின்றோம்."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once
+# | Torvalds freed Linux in 1992, it fit into the last major gap in the GNU
+# | system.  People could then <a
+# | 
href=\"http{+s+}://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01\">
+# | combine Linux with the GNU system</a> to make a complete free system
+# | &mdash; a version of the GNU system which also contained Linux.  The
+# | GNU/Linux system, in other words.
+#, fuzzy
+#| msgid ""
+#| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
+#| "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
+#| "system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+#| "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the "
+#| "GNU system</a> to make a complete free system &mdash; a version of the "
+#| "GNU system which also contained Linux.  The GNU/Linux system, in other "
+#| "words."
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -428,7 +445,7 @@
 "காபிலெப்ஃடின் கீழ் வருபவை. 
இக் கருவிகள் வழங்கலில் இல்லை 
- மேலும் விவரங்களுக்கு 
எம்மையோ "
 "(அல்லது குனுவையோ) 
கேளுங்கள்.”</a>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | [-Putting-]{+Making+} them {+work well+} together [-sounds simple, but
 # | it-] was not a trivial job.  Some GNU components<a
 # | href=\"#somecomponents\">(3)</a> needed substantial change to work with
@@ -469,10 +486,10 @@
 "காரணத்தால் இதனை எங்களால் 
ஈடு செய்ய முடியவில்லை. 
பல்வேறு வழங்கல்களை 
உருவாக்கியோர் "
 "குறிப்பிடத்தக்க 
பங்களித்தனர்."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU
 # | [-system&mdash;even with funds.  We-] {+system.  The <a
-# | href=\"http://fsf.org/\";>FSF</a>+} funded the rewriting of the
+# | href=\"https://fsf.org/\";>FSF</a>+} funded the rewriting of the
 # | Linux-related extensions to the GNU C library, so that now they are well
 # | integrated, and the newest GNU/Linux systems use the current library
 # | release with no changes.  [-We-]  {+The FSF+} also funded an early stage
@@ -487,8 +504,8 @@
 #| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -500,7 +517,7 @@
 "பயன்படுத்துகின்றன. டெபியன் 
குனு/ லினக்ஸ் வழங்கலின் 
உருவாக்கத்தின் ஆரம்ப 
கட்டத்திற்கும் நாங்கள் "
 "நிதியளித்தோம்."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | [-We use Linux-based GNU systems today for all of our work, and we hope
 # | you will use them too.-]Today there are many different variants of the
 # | GNU/Linux system (often called &ldquo;distros&rdquo;).  Most of them
@@ -539,23 +556,24 @@
 "கடைபிடிக்கின்றனர். ஆனால் <a 
href=\"/distros/distros.html\">முற்றிலும் 
கட்டற்ற குனு/ "
 "லினக்ஸ் வழங்கல்களும்</a> 
உள்ளன."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making a free GNU/Linux distribution is not just a matter of eliminating "
 "various nonfree programs.  Nowadays, the usual version of Linux contains "
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Whether you use GNU/Linux or not, please don't confuse the public by using
 # | the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the
 # | essential major components of the system.  The system as a whole is [-more
 # | or less-] {+basically+} the GNU system, with Linux added.  When you're
-# | talking about this combination, please call it &ldquo;GNU/Linux&rdquo;.
+# | talking about this combination, please call it
+# | [-&ldquo;GNU/Linux&rdquo;.-] {+&ldquo;GNU/Linux.&rdquo;+}
 #, fuzzy
 #| msgid ""
 #| "Whether you use GNU/Linux or not, please don't confuse the public by "
@@ -568,7 +586,7 @@
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "தாங்கள் குனு/ லினக்ஸ் 
பயன்படுத்துகின்றீர்களோ 
இல்லையோ, தயவு செய்து 
சந்தேகத்துக்கு இடமளிக்கும் "
 "வகையில்“ லினக்ஸ் ” என்ற 
பெயரைப் பயன்படுத்தி பொது 
மக்களை குழப்பாதீர்கள். 
லினக்ஸ் ஒரு கரு. "
@@ -576,15 +594,16 @@
 "லினக்ஸ் அதில் சேர்க்கப் 
பட்டுள்ளது. இதன் 
கூட்டமைப்பினைப் பற்றி 
தாங்கள் பேசுகிறபொழுது தயவு "
 "செய்து “குனு/ லினக்ஸ்” 
என்றழைக்கவும்."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
 # | reference, this page and <a href=\"/gnu/the-gnu-project.html\">
-# | http://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you
-# | mention Linux, the kernel, and want to add a link for further reference,
-# | <a [-href=\"http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?Linux\";>
+# | http{+s+}://www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If
+# | you mention Linux, the kernel, and want to add a link for further
+# | reference, <a
+# | [-href=\"http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?Linux\";>
 # | http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?Linux</a>-]
-# | {+href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a>+} is a good
-# | URL to use.
+# | {+href=\"https://foldoc.org/linux\";>https://foldoc.org/linux</a>+} is a
+# | good URL to use.
 #, fuzzy
 #| msgid ""
 #| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
@@ -595,10 +614,10 @@
 #| "foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?Linux</a> is a good URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "மேற்கோளிடும் பொருட்டு 
“குனு/ லினக்ஸுக்கு” தாங்கள் 
இணைப்பினை வழங்க விழைந்தால், 
இப்பக்கமும் "
 "<a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/the-gnu-";
@@ -606,14 +625,14 @@
 "அதற்கு மேற்கோளிட 
விரும்பினால் <a 
href=\"http://foldoc.org/linux\";>http://foldoc.";
 "org/linux</a> அதன் பொருட்டு 
பயன்படுத்த உகந்த இணைப்பாக 
இருக்கும்."
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 # | [-Addendum-]{+Postscripts+}
 #, fuzzy
 #| msgid "Addendum"
 msgid "Postscripts"
 msgstr "பிற்சேர்க்கைகள்"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | Aside from GNU, one other project has independently produced a free
 # | Unix-like operating system.  This system is known as BSD, and it was
 # | developed at UC Berkeley.  It was nonfree in the 80s, but became free in
@@ -641,7 +660,7 @@
 "துவக்கத்தில் கட்டற்றதானது. 
இன்று இருக்கக் கூடிய கட்டற்ற 
இயங்கு தளமொன்று உறுதியாக 
ஒன்று "
 "குனு அமைப்பின் வழி 
வந்திருக்கும் , அல்லது 
பி.எஸ்.டி யினைப் 
போலிருக்கும்."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | People sometimes ask whether BSD too is a version of GNU, like GNU/Linux. 
 # | The BSD developers were inspired to make their code free software by the
 # | example of the GNU Project, and explicit appeals from GNU activists helped
@@ -683,17 +702,17 @@
 "வில்லை. ஆகையால் குனு/பிஎஸ்டி 
எனும் பெயர் சூழ்நிலைக்குப் 
பொருந்தாது.<a href=\"#gnubsd"
 "\">(4)</a>"
 
-#. type: Content of: <div><div><h3>
-# | Notes[-:-]
+#. type: Content of: <div><h3>
+# || No change detected.  The change might only be in amounts of spaces.
 #, fuzzy
-#| msgid "Notes:"
-msgid "Notes"
-msgstr "குறிப்புகள்:"
-
-#. type: Content of: <div><div><ol><li>
-# | <a id=\"unexciting\"></a>These unexciting but essential components include
-# | the GNU [-assembler, GAS-] {+assembler (GAS)+} and the [-linker, GLD,-]
-# | {+linker (GLD),+} both are now part of the <a
+#| msgid "Footnotes"
+msgid "Footnotes"
+msgstr "பின்குறிப்புகள்"
+
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"unexciting\"></a>These-]{+These+} unexciting but essential
+# | components include the GNU [-assembler, GAS-] {+assembler (GAS)+} and the
+# | [-linker, GLD,-] {+linker (GLD),+} both are now part of the <a
 # | href=\"/software/binutils/\">GNU Binutils</a> package, <a
 # | href=\"/software/tar/\">GNU tar</a>, and {+many+} more.
 #, fuzzy
@@ -703,49 +722,65 @@
 #| "the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/"
 #| "software/tar/\">GNU tar</a>, and more."
 msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "கவர்ச்சியற்ற ஆனால் 
இன்றியமையாத பாகங்கள் குனு 
ஒன்றிணைப்பாளர், ஜி.ஏ.எஸ் 
மற்றும் இணைப்பர், ஜி."
 "எல்.டி (இவையிரண்டு தற்சமயம் <a 
href=\"/software/binutils/\">குனு 
பின்யுடில்ஸ்</a> "
 "பொதியின் அங்கங்களாகும்), <a 
href=\"/software/tar/\">குனு டார்</a> 
முதலியவற்றை "
 "உள்ளடக்கியவை."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"nottools\"></a>For-]{+For+} instance, The Bourne Again SHell
+# | (BASH), the PostScript interpreter <a
+# | href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the
+# | <a href=\"/software/libc/libc.html\">GNU C library</a> are not programming
+# | tools.  Neither are GNUCash, GNOME, and GNU Chess.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "உதாரணத்திற்கு, பார்ன் அகைன் 
ஷெல், போஸ்ட் ஸ்கிரிப்ட் 
வரியொடுக்கியான <a href=\"/software/"
 
"ghostscript/ghostscript.html\">கோஸ்ட்ஸ்கிரிப்ட்</a>,
 மற்றும் <a href=\"/software/"
 "libc/libc.html\">குனு சி நிரலகம்</a> 
போன்றவை நிரலாக்கக் 
கருவிகளல்ல. குனு காஷ், "
 "குநோம் மற்றும் குனு 
செஸ்ஸும் இத்தகையதே."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"somecomponents\"></a>For-]{+For+} instance, the <a
+# | href=\"/software/libc/libc.html\">GNU C library</a>.
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr "உதாரணத்திற்கு <a 
href=\"/software/libc/libc.html\">குனு சி 
நிரலகம்</a>."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
 msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 
-#. type: Content of: <div><div><ol><li>
-# | <a id=\"gnubsd\"></a>On the other hand, in the years since this article
-# | was written, the GNU C Library has been ported to {+several versions of+}
-# | the [-FreeBSD-] {+BSD+} kernel, which made it [-possible-]
+#. type: Content of: <div><ol><li>
+# | [-<a id=\"gnubsd\"></a>On-]{+On+} the other hand, in the years since this
+# | article was written, the GNU C Library has been ported to {+several
+# | versions of+} the [-FreeBSD-] {+BSD+} kernel, which made it [-possible-]
 # | {+straightforward+} to combine the GNU system with that kernel.  Just as
 # | with GNU/Linux, these are indeed variants of GNU, and are therefore
 # | [-called-] {+called, for instance,+} GNU/kFreeBSD and GNU/kNetBSD
@@ -761,13 +796,13 @@
 #| "system.  Ordinary users on typical desktops can hardly distinguish "
 #| "between GNU/Linux and GNU/*BSD."
 msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "ஆனால் இக்கட்டுரை இயற்றப் 
பட்டதிலிருந்து உருண்டோடிய 
வருடங்களில் குனு சி நிரலகம் "
 "ப்ஃரீபிஎஸ்டி கருவிற்கு 
உகந்ததாக்கப் பட்டது. இதனால் 
குனு அமைப்பினை அக்கருவுடன் 
இணைக்க "
@@ -824,13 +859,12 @@
 
 #. type: Content of: <div><p>
 # | Copyright &copy; [-1997, 1998, 1999, 2000, 2001, 2002, 2007-] {+1997-2002,
-# | 2007, 2014-2017, 2019, 2021+} Richard M. Stallman
+# | 2005, 2008, 2019, 2021+} Richard [-M.-] Stallman
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007 Richard M. "
 #| "Stallman"
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007 Richard M. "
 "Stallman (ரிச்சர்ட் எம். 
ஸ்டால்மேன்)"
@@ -855,6 +889,11 @@
 msgid "Updated:"
 msgstr "புதுப்பிக்கப் பட்ட 
விவரம்:"
 
+#, fuzzy
+#~| msgid "Notes:"
+#~ msgid "Notes"
+#~ msgstr "குறிப்புகள்:"
+
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"

Index: gnu/po/linux-and-gnu.tr.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.tr.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gnu/po/linux-and-gnu.tr.po  10 Apr 2021 06:59:59 -0000      1.8
+++ gnu/po/linux-and-gnu.tr.po  30 Aug 2021 13:34:54 -0000      1.9
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-04-10 08:32+0200\n"
 "Last-Translator: T. E. Kalayci <tekrei@member.fsf.org>\n"
 "Language-Team: Turkish <www-tr-comm@gnu.org>\n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 2.4.2\n"
 
@@ -39,28 +40,29 @@
 "paylaşma ve geliştirme özgürlüğüne sahip olabilmeleri için özgür 
Unix tarzı "
 "işletim sistemi GNU geliştiriliyor."
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "Linux ve GNU Sistemi"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "yazan <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"Daha fazla bilgi için ayrıca bkz. <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux SSS</a> ve <a href=\"/gnu/why-gnu-linux.html\">Neden GNU/Linux?</a>"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -75,6 +77,14 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"Daha fazla bilgi için ayrıca bkz. <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux SSS</a> ve <a href=\"/gnu/why-gnu-linux.html\">Neden GNU/Linux?</a>"
+
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -94,10 +104,17 @@
 "Linux eklenmiş GNU veya GNU/Linux'tur. Tüm sözümona &ldquo;Linux&rdquo; "
 "dağıtımları gerçekte GNU/Linux dağıtımlarıdır."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -108,7 +125,7 @@
 "Linus Torvalds'ın tüm işletim sistemini 1991 yılında biraz yardımla "
 "geliştirdiğini düşünüyor."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -126,7 +143,7 @@
 "özgür yazılımları aradıklarına ve Unix benzeri bir sistem yapmak için 
"
 "gereken her şeyin zaten mevcut olduğunu (ortada neden yokken) keşfetti."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free software</"
@@ -146,7 +163,7 @@
 "\">İlk Duyurusu</a> ayrıca GNU sistemi için bazı orijinal planların ana "
 "hatlarını çiziyor. Linux başlatıldığında GNU neredeyse bitmişti."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -162,18 +179,31 @@
 "geliştirmek için yola çıktı. Bu tür bir projenin katkısını projeden 
gelen "
 "belirli programlarla ölçmek doğaldır."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "If we tried to measure the GNU Project's contribution in this way, what "
+#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
+#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
+#| "\">GNU software</a> was the largest single contingent, around 28% of the "
+#| "total source code, and this included some of the essential major "
+#| "components without which there could be no system.  Linux itself was "
+#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
+#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
+#| "15%.)  So if you were going to pick a name for the system based on who "
+#| "wrote the programs in the system, the most appropriate single choice "
+#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "GNU Projesi'nin katkısını bu şekilde ölçmeye çalışsaydık neyin 
sonucuna "
 "varırdık? Bir CD-ROM sağlayıcı, kendi &ldquo;Linux 
dağıtımı&rdquo;nda <a "
@@ -186,7 +216,7 @@
 "yazdığına bağlı olarak sistem için bir isim seçecekseniz eğer en 
uygun "
 "yegane seçenek &ldquo;GNU&rdquo; olurdu."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -202,7 +232,7 @@
 "ama yine de bir tane geliştirdik. GNU Projesi, <em>tamamen özgür bir Unix "
 "benzeri sistem</em> geliştirmeyi amaçlıyordu: GNU'yu."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -230,7 +260,7 @@
 "yazdık <a href=\"#nottools\">(2)</a>. Hatta bir satranç oyunu geliştirdik, 
"
 "GNU Chess, çünkü bütün bir sistem de oyunlara ihtiyaç duyar."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -246,11 +276,20 @@
 "and-linux.html\">GNU Hurd 2001 yılında güvenilir bir şekilde çalışmaya 
"
 "başladı</a> ancak insanların genel kullanımına hazır olmaktan çok 
uzaktı."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
+#| "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
+#| "system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+#| "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the "
+#| "GNU system</a> to make a complete free system &mdash; a version of the "
+#| "GNU system which also contained Linux.  The GNU/Linux system, in other "
+#| "words."
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -262,7 +301,7 @@
 "a> tam bir özgür sistem yapabildiler: Linux'u de içeren bir GNU sistemi "
 "sürümü. Başka bir deyişle GNU/Linux sistemi."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -284,11 +323,19 @@
 "önemli çalışmalar yaptılar. Ancak, doğal olarak, kesinlikle birileri "
 "tarafından yapılacak bir işti."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -300,7 +347,7 @@
 "hiçbir değişiklik olmadan kullanıyor. FSF ayrıca Debian GNU/Linux'un "
 "gelişiminin erken bir aşamasını da finanse etti."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Today there are many different variants of the GNU/Linux system (often "
 "called &ldquo;distros&rdquo;).  Most of them include nonfree programs&mdash;"
@@ -320,14 +367,23 @@
 "distros/distros.html\">tamamen özgür GNU/Linux dağıtımları</a> da var. 
FSF, "
 "bunlardan birkaçı için bilgisayar olanaklarını desteklemektedir."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Making a free GNU/Linux distribution is not just a matter of eliminating "
+#| "various nonfree programs.  Nowadays, the usual version of Linux contains "
+#| "nonfree programs too.  These programs are intended to be loaded into I/O "
+#| "devices when the system starts, and they are included, as long series of "
+#| "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/"
+#| "Linux distributions now entails maintaining a <a href=\"http://directory.";
+#| "fsf.org/project/linux\"> free version of Linux</a> too."
 msgid ""
 "Making a free GNU/Linux distribution is not just a matter of eliminating "
 "various nonfree programs.  Nowadays, the usual version of Linux contains "
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 "Özgür bir GNU/Linux dağıtımı yapmak sadece çeşitli özgür olmayan 
programları "
@@ -339,13 +395,20 @@
 "project/linux\">Linux'un özgür bir sürümünün</a>  de sürdürülmesini "
 "gerektirir."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "GNU/Linux kullansanız da kullanmasanız da lütfen &ldquo;Linux&rdquo; 
adını "
 "muğlak bir şekilde kullanarak halkın kafasını karıştırmayın. Linux, 
sistemin "
@@ -353,13 +416,21 @@
 "sistem temelde Linux ile birlikte GNU sistemidir. Bu bileşenden söz ederken 
"
 "lütfen &ldquo;GNU/Linux&rdquo; olarak adlandırın."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "Daha fazla referans için &ldquo;GNU/Linux&rdquo; hakkında bir bağlantı "
 "vermek istiyorsanız bu sayfa ve <a 
href=\"/gnu/the-gnu-project.html\">http://";
@@ -368,11 +439,11 @@
 "paylaşmak istiyorsanız <a 
href=\"http://foldoc.org/linux\";>http://foldoc.org/";
 "linux</a> kullanışlı bir URL'dir."
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr "Dipnotlar"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Aside from GNU, one other project has independently produced a free Unix-"
 "like operating system.  This system is known as BSD, and it was developed at "
@@ -388,7 +459,7 @@
 "neredeyse kesinlikle ya GNU sisteminin bir türü ya da bir çeşit BSD "
 "sistemidir."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -410,29 +481,43 @@
 "BSD geliştiricileri bir çekirdek yazmadı ve GNU sistemine eklemedi ve GNU/"
 "BSD gibi bir isim duruma uymayacaktı.<a href=\"#gnubsd\">(5)</a>"
 
-#. type: Content of: <div><div><h3>
-msgid "Notes"
-msgstr "Notlar"
-
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+#. type: Content of: <div><h3>
+#, fuzzy
+#| msgid "Footnotes"
+msgid "Footnotes"
+msgstr "Dipnotlar"
+
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"unexciting\"></a>These unexciting but essential components "
+#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
+#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
+#| "\"/software/tar/\">GNU tar</a>, and many more."
+msgid ""
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\"></a>Bu heyecansız ancak gerekli bileşenler GNU "
 "assembler (GAS) ve bağlayıcıyı (GLD), her ikisi de artık <a 
href=\"/software/"
 "binutils/\">GNU Binutils</a> paketinin bir parçası, <a 
href=\"/software/tar/"
 "\">GNU tar</a> ve daha pek çok şeyi içerir."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\"></a>Örneğin; Bourne Again SHell (BASH), PostScript "
 "yorumlayıcısı <a href=\"/software/ghostscript/ghostscript.html"
@@ -440,22 +525,33 @@
 "kütüphanesi</a> programlama aracı değildir. GNUCash, GNOME ve GNU Chess 
de "
 "değildir."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\"></a>Örneğin; <a href=\"/software/libc/libc.html"
 "\">GNU C kütüphanesi</a>."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\"></a>Bu yazıldığından beri neredeyse tamamen 
özgür bir "
 "Windows benzeri sistem geliştirildi ancak teknik olarak hiç GNU veya Unix "
@@ -464,15 +560,24 @@
 "çekirdeğin eksik kısımlarını değiştirmenin yanı sıra, GNU veya 
BSD'ye de "
 "koymanız gerekir."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
+#| "was written, the GNU C Library has been ported to several versions of the "
+#| "BSD kernel, which made it straightforward to combine the GNU system with "
+#| "that kernel.  Just as with GNU/Linux, these are indeed variants of GNU, "
+#| "and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD "
+#| "depending on the kernel of the system.  Ordinary users on typical "
+#| "desktops can hardly distinguish between GNU/Linux and GNU/*BSD."
+msgid ""
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a id=\"gnubsd\"></a>Öte yandan bu yazının yazılmasından sonraki 
yıllarda "
 "GNU C Kütüphanesi, GNU sistemini bu çekirdekle birleştirmeyi 
kolaylaştıran "
@@ -529,8 +634,11 @@
 "\">çalışma&nbsp;sayfamızı</a> ziyaret edebilirsiniz."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. "
+#| "Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
 
@@ -558,3 +666,6 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Son Güncelleme:"
+
+#~ msgid "Notes"
+#~ msgstr "Notlar"

Index: gnu/po/linux-and-gnu.uk-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.uk-diff.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gnu/po/linux-and-gnu.uk-diff.html   8 Jun 2021 08:44:38 -0000       1.8
+++ gnu/po/linux-and-gnu.uk-diff.html   30 Aug 2021 13:34:54 -0000      1.9
@@ -10,44 +10,49 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.84</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&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.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;Linux and GNU
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;meta http-equiv="Keywords" content="GNU, FSF, Free Software Foundation, 
Linux, Emacs, GCC, Unix, Free Software, Operating System, GNU Kernel, HURD, GNU 
HURD, Hurd" /&gt;
 &lt;meta http-equiv="Description" content="Since 1983, developing the free 
Unix style operating system GNU, so that computer users can have the freedom to 
share and improve the software they use." /&gt;
 &lt;!--#include virtual="/gnu/po/linux-and-gnu.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;Linux</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;Linux</em></ins></span> 
and the GNU System&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;Linux and the GNU System&lt;/h2&gt;
 
-<span 
class="removed"><del><strong>&lt;p&gt;&lt;strong&gt;by</strong></del></span>
+<span class="removed"><del><strong>&lt;p&gt;&lt;strong&gt;by &lt;a 
href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
-<span class="inserted"><ins><em>&lt;address class="byline 
c"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
-<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;
-
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;For</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;For</em></ins></span> more 
information see also
-the &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;,
+  &lt;blockquote&gt;&lt;p&gt;For more information see also
+the</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;address 
class="byline"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux 
FAQ&lt;/a&gt;,
 and &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;&lt;/p&gt;
-  <span class="removed"><del><strong>&lt;/blockquote&gt;</strong></del></span>
-&lt;/div&gt;
-<span class="inserted"><ins><em>&lt;hr class="thin" /&gt;
+  &lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;
 Many computer users run a modified version of
 &lt;a href="/philosophy/categories.html#TheGNUsystem"&gt;the GNU 
system&lt;/a&gt;
 every day, without realizing it.  Through a peculiar turn of events,
 the version of GNU which is widely used today is often called
-&ldquo;Linux&rdquo;, and many of its users
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux,&rdquo;</em></ins></span> and 
many of its users
 are &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt; not aware&lt;/a&gt;
 that it is basically the GNU system, developed by the
 &lt;a href="/gnu/gnu-history.html"&gt;GNU Project&lt;/a&gt;.&lt;/p&gt;
 
+<span class="inserted"><ins><em>&lt;div class="announcement comment" 
role="complementary"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;p&gt;For more information see also
+the &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;,
+and &lt;a href="/gnu/why-gnu-linux.html"&gt;Why GNU/Linux?&lt;/a&gt;&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;</em></ins></span>
+
 &lt;p&gt;
 There really is a Linux, and these people are using it, but it is just
 a part of the system they use.  Linux is the kernel: the program in
@@ -63,7 +68,8 @@
 &lt;p&gt;
 Many users do not understand the difference between the kernel, which
 is Linux, and the whole system, which they also call
-&ldquo;Linux&rdquo;.  The ambiguous use of the name doesn't help
+<span class="removed"><del><strong>&ldquo;Linux&rdquo;.</strong></del></span>
+<span class="inserted"><ins><em>&ldquo;Linux.&rdquo;</em></ins></span>  The 
ambiguous use of the name doesn't help
 people understand.  These users often think that Linus Torvalds
 developed the whole operating system in 1991, with a bit of help.&lt;/p&gt;
 
@@ -100,7 +106,8 @@
 &lt;p&gt;
 If we tried to measure the GNU Project's contribution in this way,
 what would we conclude?  One CD-ROM vendor found that in their &ldquo;Linux
-distribution&rdquo;, &lt;a 
href="/philosophy/categories.html#GNUsoftware"&gt;GNU
+<span class="removed"><del><strong>distribution&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>distribution,&rdquo;</em></ins></span> &lt;a 
href="/philosophy/categories.html#GNUsoftware"&gt;GNU
 software&lt;/a&gt; was the largest single contingent, around 28% of the
 total source code, and this included some of the essential major
 components without which there could be no system.  Linux itself was
@@ -108,7 +115,7 @@
 repository of gNewSense, Linux is 1.5% and GNU packages are 15%.)
 So if you were going to pick a name for the system based on
 who wrote the programs in the system, the most appropriate single
-choice would be &ldquo;GNU&rdquo;.&lt;/p&gt;
+choice would be <span 
class="removed"><del><strong>&ldquo;GNU&rdquo;.&lt;/p&gt;</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;GNU.&rdquo;&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
 But that is not the deepest way to consider the question.  The GNU
@@ -147,7 +154,7 @@
 Fortunately, we didn't have to wait for the Hurd, because of Linux.
 Once Torvalds freed Linux in 1992, it fit into the last major gap in
 the GNU system.  People could
-then &lt;a 
href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;
+then &lt;a <span 
class="removed"><del><strong>href="http://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://ftp.funet.fi/pub/linux/historical/kernel/old-versions/RELNOTES-0.01"&gt;</em></ins></span>
 combine Linux with the GNU system&lt;/a&gt; to make a complete free system
 &mdash; a version of the GNU system which also contained Linux.  The
 GNU/Linux system, in other words.&lt;/p&gt;
@@ -165,7 +172,7 @@
 
 &lt;p&gt;
 The GNU Project supports GNU/Linux systems as well as &lt;em&gt;the&lt;/em&gt; 
GNU
-system.  The &lt;a href="http://fsf.org/"&gt;FSF&lt;/a&gt; funded the 
rewriting of
+system.  The &lt;a <span 
class="removed"><del><strong>href="http://fsf.org/"&gt;FSF&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://fsf.org/"&gt;FSF&lt;/a&gt;</em></ins></span>
 funded the rewriting of
 the Linux-related extensions to the GNU C library, so that now they
 are well integrated, and the newest GNU/Linux systems use the current
 library release with no changes.  The FSF also funded an early stage
@@ -189,7 +196,7 @@
 be loaded into I/O devices when the system starts, and they are
 included, as long series of numbers, in the "source code" of Linux.
 Thus, maintaining free GNU/Linux distributions now entails maintaining
-a &lt;a href="http://directory.fsf.org/project/linux"&gt; free version of
+a &lt;a <span 
class="removed"><del><strong>href="http://directory.fsf.org/project/linux"&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://directory.fsf.org/project/linux"&gt;</em></ins></span>
 free version of
 Linux&lt;/a&gt; too.&lt;/p&gt;
 
 &lt;p&gt;Whether you use GNU/Linux or not, please don't confuse the public
@@ -197,14 +204,16 @@
 kernel, one of the essential major components of the system.  The
 system as a whole is basically the GNU system, with Linux added.  When
 you're talking about this combination, please call it
-&ldquo;GNU/Linux&rdquo;.&lt;/p&gt;
+<span 
class="removed"><del><strong>&ldquo;GNU/Linux&rdquo;.&lt;/p&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>&ldquo;GNU/Linux.&rdquo;&lt;/p&gt;</em></ins></span>
 
 &lt;p&gt;
 If you want to make a link on &ldquo;GNU/Linux&rdquo; for further
 reference, this page and &lt;a href="/gnu/the-gnu-project.html"&gt;
-http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt; are good choices.  If
+<span 
class="removed"><del><strong>http://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</strong></del></span>
+<span 
class="inserted"><ins><em>https://www.gnu.org/gnu/the-gnu-project.html&lt;/a&gt;</em></ins></span>
 are good choices.  If
 you mention Linux, the kernel, and want to add a link for further
-reference, &lt;a 
href="http://foldoc.org/linux"&gt;http://foldoc.org/linux&lt;/a&gt; 
+reference, &lt;a <span 
class="removed"><del><strong>href="http://foldoc.org/linux"&gt;http://foldoc.org/linux&lt;/a&gt;</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://foldoc.org/linux"&gt;https://foldoc.org/linux&lt;/a&gt;</em></ins></span>
 
 is a good URL to use.&lt;/p&gt;
 
 <span 
class="removed"><del><strong>&lt;h3&gt;Postscripts&lt;/h3&gt;</strong></del></span>
@@ -235,35 +244,44 @@
 <span 
class="removed"><del><strong>&lt;h3&gt;Notes:&lt;/h3&gt;</strong></del></span>
 <span class="inserted"><ins><em>&lt;div class="column-limit"&gt;&lt;/div&gt;
 
-&lt;h3 class="footnote"&gt;Notes&lt;/h3&gt;</em></ins></span>
+&lt;h3 class="footnote"&gt;Footnotes&lt;/h3&gt;</em></ins></span>
 &lt;ol&gt;
-&lt;li&gt;
-&lt;a id="unexciting"&gt;&lt;/a&gt;These unexciting but essential components
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="unexciting"&gt;&lt;/a&gt;These</strong></del></span>
+<span class="inserted"><ins><em>&lt;li 
id="unexciting"&gt;These</em></ins></span> unexciting but essential components
 include the GNU assembler (GAS) and the linker (GLD), both
 are now part of the &lt;a href="/software/binutils/"&gt;GNU Binutils&lt;/a&gt;
 package, &lt;a href="/software/tar/"&gt;GNU tar&lt;/a&gt;, and many 
more.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="nottools"&gt;&lt;/a&gt;For instance, The Bourne Again SHell (BASH),
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="nottools"&gt;&lt;/a&gt;For</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li id="nottools"&gt;For</em></ins></span> 
instance, The Bourne Again SHell (BASH),
 the PostScript interpreter
 &lt;a href="/software/ghostscript/ghostscript.html"&gt;Ghostscript&lt;/a&gt;, 
and the
 &lt;a href="/software/libc/libc.html"&gt;GNU C library&lt;/a&gt; are not
 programming tools.  Neither are GNUCash, GNOME, and GNU Chess.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="somecomponents"&gt;&lt;/a&gt;For instance, the
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="somecomponents"&gt;&lt;/a&gt;For</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li 
id="somecomponents"&gt;For</em></ins></span> instance, the
 &lt;a href="/software/libc/libc.html"&gt;GNU C library&lt;/a&gt;.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="newersystems"&gt;&lt;/a&gt;Since that was written, a nearly-all-free
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="newersystems"&gt;&lt;/a&gt;Since</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li 
id="newersystems"&gt;Since</em></ins></span> that was written, a nearly-all-free
 Windows-like system has been developed, but technically it is not at
 all like GNU or Unix, so it doesn't really affect this issue.  Most of
 the kernel of Solaris has been made free, but if you wanted to make a
 free system out of that, aside from replacing the missing parts of the
 kernel, you would also need to put it into GNU or BSD.&lt;/li&gt;
 
-&lt;li&gt;
-&lt;a id="gnubsd"&gt;&lt;/a&gt;On the other hand, in the years since this 
article
+<span class="removed"><del><strong>&lt;li&gt;
+&lt;a id="gnubsd"&gt;&lt;/a&gt;On</strong></del></span>
+
+<span class="inserted"><ins><em>&lt;li id="gnubsd"&gt;On</em></ins></span> the 
other hand, in the years since this article
 was written, the GNU C Library has been ported to several versions of
 the BSD kernel, which made it straightforward to combine the GNU system
 with that kernel.  Just as with GNU/Linux, these are indeed variants of
@@ -271,10 +289,8 @@
 GNU/kNetBSD depending on the kernel of the system.  Ordinary users on
 typical desktops can hardly distinguish between GNU/Linux and
 GNU/*BSD.&lt;/li&gt;
-
 &lt;/ol&gt;
-<span class="inserted"><ins><em>&lt;/div&gt;
-&lt;/div&gt;</em></ins></span>
+<span class="inserted"><ins><em>&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;
@@ -323,7 +339,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; <span class="removed"><del><strong>1997, 1998, 1999, 
2000, 2001, 2002,</strong></del></span> <span 
class="inserted"><ins><em>1997-2002,</em></ins></span> 2007, <span 
class="removed"><del><strong>2014, 2015, 2016, 2017</strong></del></span> <span 
class="inserted"><ins><em>2014-2017, 2019, 2021</em></ins></span> Richard M. 
Stallman&lt;/p&gt;
+&lt;p&gt;Copyright &copy; <span class="removed"><del><strong>1997, 1998, 1999, 
2000, 2001, 2002,
+2007, 2014, 2015, 2016, 2017</strong></del></span> <span 
class="inserted"><ins><em>1997-2002, 2005, 2008, 2019, 2021</em></ins></span> 
Richard <span class="removed"><del><strong>M.</strong></del></span> 
Stallman&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
@@ -333,11 +350,12 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/06/08 08:44:38 $
+$Date: 2021/08/30 13:34:54 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-&lt;/div&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for class="inner", starts 
in the banner include --&gt;</em></ins></span>
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>

Index: gnu/po/linux-and-gnu.uk.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.uk.po,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- gnu/po/linux-and-gnu.uk.po  31 May 2021 20:31:29 -0000      1.30
+++ gnu/po/linux-and-gnu.uk.po  30 Aug 2021 13:34:54 -0000      1.31
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2017-12-10 09:03+0200\n"
 "Last-Translator: Andriy Bandura <andriykopanytsia@gmail.com>\n"
 "Language-Team: Ukrainian <>\n"
@@ -42,29 +42,29 @@
 "користувачів комп'ютерів могла бути 
свобода обмінюватися програмами, якими "
 "вони користуються, і покращувати їх."
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "Linux і система GNU"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"https://www.stallman.org/\";>Річард Столмен</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"Подробивці можна знайти на сторінках <a 
href=\"/gnu/gnu-linux-faq.html"
-"\">&ldquo;ЧаП GNU/Linux&rdquo;</a> та <a href=\"/gnu/why-gnu-linux.html"
-"\">&ldquo;Чому GNU/Linux?&rdquo;</a>"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -79,6 +79,15 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"Подробивці можна знайти на сторінках <a 
href=\"/gnu/gnu-linux-faq.html"
+"\">&ldquo;ЧаП GNU/Linux&rdquo;</a> та <a href=\"/gnu/why-gnu-linux.html"
+"\">&ldquo;Чому GNU/Linux?&rdquo;</a>"
+
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -99,10 +108,17 @@
 "так звані дистрибутиви &ldquo;Linux&rdquo; 
насправді є дистрибутивами GNU/"
 "Linux. "
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -113,7 +129,7 @@
 "Лінус Торвальдс розробив цілу операційну 
систему 1991&nbsp;&nbsp; році, йому "
 "тільки трохи допомогли. "
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -131,7 +147,7 @@
 "програм, щоб працювати з ним, і виявили, що 
(без якої б то не було особливої "
 "причини) майже все необхідне для побудови 
системи типу Unix вже під рукою. "
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free software</"
@@ -151,7 +167,7 @@
 "</a> проекту GNU також окреслює деякі з 
початкових планів по системі GNU. До "
 "того часу, коли почалася розробка Linux, GNU 
була майже завершена."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -167,18 +183,31 @@
 "Window). Природно вимірювати внесок такого 
роду проекту конкретними "
 "програмами, які прийшли з цього проекту."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "If we tried to measure the GNU Project's contribution in this way, what "
+#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
+#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
+#| "\">GNU software</a> was the largest single contingent, around 28% of the "
+#| "total source code, and this included some of the essential major "
+#| "components without which there could be no system.  Linux itself was "
+#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
+#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
+#| "15%.)  So if you were going to pick a name for the system based on who "
+#| "wrote the programs in the system, the most appropriate single choice "
+#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "Якщо б ми спробували виміряти таким чином 
внесок проекту GNU, до якого б "
 "висновку ми прийшли? Один з 
постачальників компакт-дисків встановив, 
що в їх "
@@ -191,7 +220,7 @@
 "збиралися вибрати назву системи на 
підставі того, хто написав програми в цій "
 "системі, найвідповіднішим вибором одного 
компонента було б &ldquo;GNU&rdquo;."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -206,7 +235,7 @@
 "текстового редактора, хоча ми розробили 
його. Проект GNU постановив "
 "розробити <em>повну вільну операційну 
систему типу Unix</em>: GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -235,7 +264,7 @@
 "навіть розробили програму для ігри в шахи, 
GNU Chess, тому що в повній "
 "системі ігри теж повинні бути. "
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -251,11 +280,20 @@
 "надійно працювати в 2001&nbsp;році</a>, але воно 
далеко не готове для "
 "загального користування."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
+#| "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
+#| "system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+#| "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the "
+#| "GNU system</a> to make a complete free system &mdash; a version of the "
+#| "GNU system which also contained Linux.  The GNU/Linux system, in other "
+#| "words."
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -266,7 +304,7 @@
 "[1]</a>, щоб скласти повну вільну систему: 
версію GNU, яка містила також "
 "Linux; іншими словами, систему GNU/Linux. "
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -288,11 +326,19 @@
 "виконали велику і важливу роботу. Але це 
було роботою, яку, по самій природі "
 "речей,обов'язково хто-небудь виконав би. "
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -304,7 +350,7 @@
 "використовують поточну версію бібліотеки 
без змін. ФВПЗ фінансував також на "
 "ранній стадії розробку Debian GNU/Linux."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "Today there are many different variants of the GNU/Linux system (often "
@@ -330,7 +376,7 @@
 "a>. ФВПЗ надає технічні ресурси для 
дистрибутиву <a href=\"http://gnewsense.";
 "org/\">gNewSense</a>. "
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "Making a free GNU/Linux distribution is not just a matter of eliminating "
@@ -346,7 +392,7 @@
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 "Щоб створити вільний дистрибутив GNU/Linux, 
недостатньо просто виключити "
@@ -357,13 +403,20 @@
 "підтримка вільних дистрибутивів GNU/Linux 
зараз включає також і підтримку <a "
 "href=\"http://directory.fsf.org/project/linux\";>вільної версії 
Linux</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "Чи використовуєте ви GNU/Linux чи ні, не 
вводьте громадськість в оману "
 "двозначним вживанням назви &ldquo;Linux&rdquo;. 
Linux&nbsp;&mdash; це ядро, "
@@ -371,13 +424,21 @@
 "основному система GNU з додаванням Linux. Коли 
ви говорите про це "
 "сполучення, то, будь ласка, називайте його 
&ldquo;GNU/Linux&rdquo;."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "Якщо ви хочете послатися для довідок на 
&ldquo;GNU/Linux&rdquo;, цясторінка "
 "і <a href=\"/gnu/the-gnu-project.html\">http://www.gnu.org/gnu/the-gnu-";
@@ -385,11 +446,11 @@
 "додати посилання для довідок, <a 
href=\"http://foldoc.org/linux\";>http://";
 "foldoc.org/foldoc/linux</a> - хороша адреса дляцього."
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr "Доповнення"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "Aside from GNU, one other project has independently produced a free Unix-"
@@ -413,7 +474,7 @@
 "операційних систем, існуючих сьогодні,<a 
href=\"#newersystems\">(4)</a> "
 "майже напевно є варіантом системи GNU, або 
різновидом системи BSD."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -435,29 +496,43 @@
 "розробивши його, тому назва типу 
&ldquo;GNU/BSD&rdquo; не підійшла б до "
 "ситуації<a href=\"#gnubsd\">(5)</a>."
 
-#. type: Content of: <div><div><h3>
-msgid "Notes"
-msgstr "Примітки"
-
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+#. type: Content of: <div><h3>
+#, fuzzy
+#| msgid "Footnotes"
+msgid "Footnotes"
+msgstr "Виноски"
+
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"unexciting\"></a>These unexciting but essential components "
+#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
+#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
+#| "\"/software/tar/\">GNU tar</a>, and many more."
+msgid ""
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\"></a>Ці не вражаючі, але суттєві 
компоненти включають "
 "GNUасемблер (GAS) і редактор зв'язків (GLD), які 
зараз обидва входять у "
 "пакет  <a href=\"/software/binutils/\">GNU Binutils</a>, <a 
href=\"/software/"
 "tar/\">GNU tar</a> та інші."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\"></a>Наприклад, Bourne Again SHell (BASH), 
інтерпретатор "
 "мови PostScript <a href=\"/software/ghostscript/ghostscript.html"
@@ -465,22 +540,33 @@
 "a> не є засобами програмування. Також до них
 не відносяться GNUCash, GNOME і "
 "GNU Chess."
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\"></a>Наприклад, <a 
href=\"/software/libc/libc.html"
 "\">бібліотека C GNU</a>."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\"></a>З тих пір, як були написані 
ці рядки, була "
 "розроблена майже повністю вільна 
операційна система, подібна Windows, але з "
@@ -489,15 +575,24 @@
 "б ви захотіли зробити з нього вільну 
систему, крім заміни відсутніх частин "
 "ядра, вам треба було б також покласти її в 
GNU або BSD."
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
+#| "was written, the GNU C Library has been ported to several versions of the "
+#| "BSD kernel, which made it straightforward to combine the GNU system with "
+#| "that kernel.  Just as with GNU/Linux, these are indeed variants of GNU, "
+#| "and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD "
+#| "depending on the kernel of the system.  Ordinary users on typical "
+#| "desktops can hardly distinguish between GNU/Linux and GNU/*BSD."
+msgid ""
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a id=\"gnubsd\"></a>З іншого боку, за роки, що 
минули з часу написання цієї "
 "статті, бібліотека C GNU була перенесена на 
кілька версій ядра BSD, що "
@@ -554,8 +649,7 @@
 #| msgid ""
 #| "Copyright &copy; 1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014, 2015, "
 #| "2016, 2017 Richard M. Stallman"
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy;  1997, 1998, 1999, 2000, 2001, 2002, 2007, 2014, 2015, "
 "2016, 2017 Richard M. Stallman (Річард Столмен)"
@@ -582,6 +676,9 @@
 msgid "Updated:"
 msgstr "Оновлено:"
 
+#~ msgid "Notes"
+#~ msgstr "Примітки"
+
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"

Index: gnu/po/linux-and-gnu.zh-cn.po
===================================================================
RCS file: /web/www/www/gnu/po/linux-and-gnu.zh-cn.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gnu/po/linux-and-gnu.zh-cn.po       12 Apr 2021 07:02:47 -0000      1.9
+++ gnu/po/linux-and-gnu.zh-cn.po       30 Aug 2021 13:34:54 -0000      1.10
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: linux-and-gnu.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-04-12 14:29+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -15,6 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 
 #. type: Content of: <title>
 msgid "Linux and GNU - GNU Project - Free Software Foundation"
@@ -37,29 +38,30 @@
 
"自1983年以来,我们一直在开发自由的类Unix操作系统GNU,这æ 
·è®¡ç®—机用户就能够拥有"
 "分享和改进他们使用的软件的自由。"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "Linux and the GNU System"
 msgstr "Linux和GNU系统"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"https://www.stallman.org/\";>理查德·斯托曼</a> 著"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
-msgstr ""
-"更多信息,请同时参看<a 
href=\"/gnu/gnu-linux-faq.html\">GNU/Linux常见问题</a>"
-"和<a href=\"/gnu/why-gnu-linux.html\">为什么是GNU/Linux?</a>"
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Many computer users run a modified version of <a href=\"/philosophy/"
+#| "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
+#| "realizing it.  Through a peculiar turn of events, the version of GNU "
+#| "which is widely used today is often called &ldquo;Linux&rdquo;, and many "
+#| "of its users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not "
+#| "aware</a> that it is basically the GNU system, developed by the <a href="
+#| "\"/gnu/gnu-history.html\">GNU Project</a>."
 msgid ""
 "Many computer users run a modified version of <a href=\"/philosophy/"
 "categories.html#TheGNUsystem\">the GNU system</a> every day, without "
 "realizing it.  Through a peculiar turn of events, the version of GNU which "
-"is widely used today is often called &ldquo;Linux&rdquo;, and many of its "
+"is widely used today is often called &ldquo;Linux,&rdquo; and many of its "
 "users are <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> not aware</a> "
 "that it is basically the GNU system, developed by the <a href=\"/gnu/gnu-"
 "history.html\">GNU Project</a>."
@@ -72,6 +74,14 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+"For more information see also the <a href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>, and <a href=\"/gnu/why-gnu-linux.html\">Why GNU/Linux?</a>"
+msgstr ""
+"更多信息,请同时参看<a 
href=\"/gnu/gnu-linux-faq.html\">GNU/Linux常见问题</a>"
+"和<a href=\"/gnu/why-gnu-linux.html\">为什么是GNU/Linux?</a>"
+
+#. type: Content of: <div><p>
+msgid ""
 "There really is a Linux, and these people are using it, but it is just a "
 "part of the system they use.  Linux is the kernel: the program in the system "
 "that allocates the machine's resources to the other programs that you run.  "
@@ -88,10 +98,17 @@
 "一起使用:整个系统基本上就是GNU加
上Linux,或叫GNU/Linux。所有被叫做&ldquo;"
 "Linux&rdquo;的发行版实际上是GNU/Linux发行版。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Many users do not understand the difference between the kernel, which is "
+#| "Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  "
+#| "The ambiguous use of the name doesn't help people understand.  These "
+#| "users often think that Linus Torvalds developed the whole operating "
+#| "system in 1991, with a bit of help."
 msgid ""
 "Many users do not understand the difference between the kernel, which is "
-"Linux, and the whole system, which they also call &ldquo;Linux&rdquo;.  The "
+"Linux, and the whole system, which they also call &ldquo;Linux.&rdquo; The "
 "ambiguous use of the name doesn't help people understand.  These users often "
 "think that Linus Torvalds developed the whole operating system in 1991, with "
 "a bit of help."
@@ -100,7 +117,7 @@
 "别。而不加
区别地使用该名称并不能帮助人们对此的理解。这些用户常常认为Linus
 "
 "Torvalds在1991年凭借一些帮助完成了整个操作系统的开发。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Programmers generally know that Linux is a kernel.  But since they have "
 "generally heard the whole system called &ldquo;Linux&rdquo; as well, they "
@@ -115,7 +132,7 @@
 "旦Linus Torvalds完成了Linux内核,å…
¶ç”¨æˆ·å°±æœç´¢ä¸€äº›è‡ªç”±è½¯ä»¶æ¥å’Œå†…核一起工作,此"
 "时他们发现(没有特别的原因
)构成一个类似Unix系统的大多数必要组件已经有了。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "What they found was no accident&mdash;it was the not-quite-complete GNU "
 "system.  The available <a href=\"/philosophy/free-sw.html\">free software</"
@@ -133,7 +150,7 @@
 "<a 
href=\"/gnu/initial-announcement.html\">初始声明</a>也勾画了GNU系统的一些"
 "原始计划。在Linux开始时,GNU几乎已经完成。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Most free software projects have the goal of developing a particular program "
 "for a particular job.  For example, Linus Torvalds set out to write a Unix-"
@@ -146,18 +163,31 @@
 "Unix的内核(Linux);Donald 
Knuth编写一个文本排版软件(TeX);Bob Scheifler开"
 "发一个窗口系统(X 
Window系统)。测量该工程里各个程序的贡献是一件自然的事æƒ
…。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "If we tried to measure the GNU Project's contribution in this way, what "
+#| "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
+#| "distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware"
+#| "\">GNU software</a> was the largest single contingent, around 28% of the "
+#| "total source code, and this included some of the essential major "
+#| "components without which there could be no system.  Linux itself was "
+#| "about 3%.  (The proportions in 2008 are similar: in the &ldquo;"
+#| "main&rdquo; repository of gNewSense, Linux is 1.5% and GNU packages are "
+#| "15%.)  So if you were going to pick a name for the system based on who "
+#| "wrote the programs in the system, the most appropriate single choice "
+#| "would be &ldquo;GNU&rdquo;."
 msgid ""
 "If we tried to measure the GNU Project's contribution in this way, what "
 "would we conclude? One CD-ROM vendor found that in their &ldquo;Linux "
-"distribution&rdquo;, <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
+"distribution,&rdquo; <a href=\"/philosophy/categories.html#GNUsoftware\">GNU "
 "software</a> was the largest single contingent, around 28% of the total "
 "source code, and this included some of the essential major components "
 "without which there could be no system.  Linux itself was about 3%.  (The "
 "proportions in 2008 are similar: in the &ldquo;main&rdquo; repository of "
 "gNewSense, Linux is 1.5% and GNU packages are 15%.)  So if you were going to "
 "pick a name for the system based on who wrote the programs in the system, "
-"the most appropriate single choice would be &ldquo;GNU&rdquo;."
+"the most appropriate single choice would be &ldquo;GNU.&rdquo;"
 msgstr ""
 "如果我们这æ 
·æµ‹é‡GNU工程的贡献,我们会得出什么结论?一个CD-ROM提供商发现在他们"
 "的&ldquo;Linux发行版&rdquo;中,<a href=\"/philosophy/categories."
@@ -167,7 +197,7 @@
 "15%。)所以如果你要根据谁的代ç 
å¤šæ¥å‘½åç³»ç»Ÿï¼Œæœ€åˆé€‚的单个选择是&ldquo;"
 "GNU&rdquo;。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "But that is not the deepest way to consider the question.  The GNU Project "
 "was not, is not, a project to develop specific software packages.  It was "
@@ -181,7 +211,7 @@
 
"我们做了。它也不是一个开发文本编辑器的工程,我们也做了。GNU工程是要开发<em>一"
 "个完全自由的类似Unix的系统</em>:GNU。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Many people have made major contributions to the free software in the "
 "system, and they all deserve credit for their software.  But the reason it "
@@ -205,7 +235,7 @@
 "编写了许多不是工具的部件<a 
href=\"#nottools\">(2)</a>。我们甚至还开发了一个国"
 "际象棋游戏,叫GNU Chess,因
为一个完整的系统也需要游戏。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "By the early 90s we had put together the whole system aside from the "
 "kernel.  We had also started a kernel, the <a href=\"/software/hurd/hurd.html"
@@ -220,11 +250,20 @@
 "要难得多;<a href=\"/software/hurd/hurd-and-linux.html\">GNU 
Hurd在2001年开始"
 
"可以稳定工作</a>,但是距离能够被人们正常使用还有很长的路要走。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
+#| "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
+#| "system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+#| "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the "
+#| "GNU system</a> to make a complete free system &mdash; a version of the "
+#| "GNU system which also contained Linux.  The GNU/Linux system, in other "
+#| "words."
 msgid ""
 "Fortunately, we didn't have to wait for the Hurd, because of Linux.  Once "
 "Torvalds freed Linux in 1992, it fit into the last major gap in the GNU "
-"system.  People could then <a href=\"http://ftp.funet.fi/pub/linux/";
+"system.  People could then <a href=\"https://ftp.funet.fi/pub/linux/";
 "historical/kernel/old-versions/RELNOTES-0.01\"> combine Linux with the GNU "
 "system</a> to make a complete free system &mdash; a version of the GNU "
 "system which also contained Linux.  The GNU/Linux system, in other words."
@@ -235,7 +274,7 @@
 
"GNU系统结合起来</a>组成一个完整的自由系统&mdash;一个带有Linux的GNU系统。换句"
 "话说,就是GNU/Linux系统。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Making them work well together was not a trivial job.  Some GNU components<a "
 "href=\"#somecomponents\">(3)</a> needed substantial change to work with "
@@ -254,11 +293,19 @@
 
"不同的发行版的人们作出了许多重要的工作。但是这些工作的属性是,它们终究会被某"
 "些人做的。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
+#| "system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of "
+#| "the Linux-related extensions to the GNU C library, so that now they are "
+#| "well integrated, and the newest GNU/Linux systems use the current library "
+#| "release with no changes.  The FSF also funded an early stage of the "
+#| "development of Debian GNU/Linux."
 msgid ""
 "The GNU Project supports GNU/Linux systems as well as <em>the</em> GNU "
-"system.  The <a href=\"http://fsf.org/\";>FSF</a> funded the rewriting of the "
-"Linux-related extensions to the GNU C library, so that now they are well "
+"system.  The <a href=\"https://fsf.org/\";>FSF</a> funded the rewriting of "
+"the Linux-related extensions to the GNU C library, so that now they are well "
 "integrated, and the newest GNU/Linux systems use the current library release "
 "with no changes.  The FSF also funded an early stage of the development of "
 "Debian GNU/Linux."
@@ -268,7 +315,7 @@
 "地集成在一起,最新版本的GNU/Linux系统使用当前库而无
需修改。FSF也为早期Debian "
 "GNU/Linux的开发提供资金。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Today there are many different variants of the GNU/Linux system (often "
 "called &ldquo;distros&rdquo;).  Most of them include nonfree programs&mdash;"
@@ -286,14 +333,23 @@
 "件&rdquo;哲学</a>。然而,也有<a href=\"/distros/distros.html\">完å…
¨è‡ªç”±çš„GNU/"
 "Linux发行版</a>。FSF支持其中一些发行版相关的电脑及å…
¶å‘¨è¾¹ä»¶ã€‚"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Making a free GNU/Linux distribution is not just a matter of eliminating "
+#| "various nonfree programs.  Nowadays, the usual version of Linux contains "
+#| "nonfree programs too.  These programs are intended to be loaded into I/O "
+#| "devices when the system starts, and they are included, as long series of "
+#| "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/"
+#| "Linux distributions now entails maintaining a <a href=\"http://directory.";
+#| "fsf.org/project/linux\"> free version of Linux</a> too."
 msgid ""
 "Making a free GNU/Linux distribution is not just a matter of eliminating "
 "various nonfree programs.  Nowadays, the usual version of Linux contains "
 "nonfree programs too.  These programs are intended to be loaded into I/O "
 "devices when the system starts, and they are included, as long series of "
 "numbers, in the \"source code\" of Linux.  Thus, maintaining free GNU/Linux "
-"distributions now entails maintaining a <a href=\"http://directory.fsf.org/";
+"distributions now entails maintaining a <a href=\"https://directory.fsf.org/";
 "project/linux\"> free version of Linux</a> too."
 msgstr ""
 
"制作一个自由的GNU/Linux发行版不止是剔除非自由软件。现在,常规的Linux版本也带"
@@ -302,36 +358,51 @@
 "一个<a 
href=\"http://directory.fsf.org/project/linux\";>自由版Linux</a>的责"
 "任。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Whether you use GNU/Linux or not, please don't confuse the public by "
+#| "using the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one "
+#| "of the essential major components of the system.  The system as a whole "
+#| "is basically the GNU system, with Linux added.  When you're talking about "
+#| "this combination, please call it &ldquo;GNU/Linux&rdquo;."
 msgid ""
 "Whether you use GNU/Linux or not, please don't confuse the public by using "
 "the name &ldquo;Linux&rdquo; ambiguously.  Linux is the kernel, one of the "
 "essential major components of the system.  The system as a whole is "
 "basically the GNU system, with Linux added.  When you're talking about this "
-"combination, please call it &ldquo;GNU/Linux&rdquo;."
+"combination, please call it &ldquo;GNU/Linux.&rdquo;"
 msgstr ""
 "无论你是否使用GNU/Linux,请不要含糊不清
地使用&ldquo;Linux&rdquo;这一名称来混"
 "淆大众。Linux是一个内æ 
¸ï¼Œæ˜¯ç³»ç»Ÿçš„主要基本部件之一。整个系统基本上是GNU系统,"
 "加上Linux。如果你
说的是这个组合,请称之为&ldquo;GNU/Linux&rdquo;。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further "
+#| "reference, this page and <a href=\"/gnu/the-gnu-project.html\"> http://";
+#| "www.gnu.org/gnu/the-gnu-project.html</a> are good choices.  If you "
+#| "mention Linux, the kernel, and want to add a link for further reference, "
+#| "<a href=\"http://foldoc.org/linux\";>http://foldoc.org/linux</a> is a good "
+#| "URL to use."
 msgid ""
 "If you want to make a link on &ldquo;GNU/Linux&rdquo; for further reference, "
-"this page and <a href=\"/gnu/the-gnu-project.html\"> http://www.gnu.org/gnu/";
+"this page and <a href=\"/gnu/the-gnu-project.html\"> https://www.gnu.org/gnu/";
 "the-gnu-project.html</a> are good choices.  If you mention Linux, the "
-"kernel, and want to add a link for further reference, <a href=\"http://";
-"foldoc.org/linux\">http://foldoc.org/linux</a> is a good URL to use."
+"kernel, and want to add a link for further reference, <a href=\"https://";
+"foldoc.org/linux\">https://foldoc.org/linux</a> is a good URL to use."
 msgstr ""
 "如果你想为&ldquo;GNU/Linux&rdquo;提供参考链接,本页面和<a 
href=\"/gnu/the-"
 
"gnu-project.html\">http://www.gnu.org/gnu/the-gnu-project.html</a>是好的选"
 "择。如果你说的是作为内æ 
¸çš„Linux,要为它提供参考链接,<a href=\"http://foldoc.";
 "org/linux\">http://foldoc.org/linux</a>是一个好的URL。"
 
-#. type: Content of: <div><div><h3>
+#. type: Content of: <div><h3>
 msgid "Postscripts"
 msgstr "后记"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Aside from GNU, one other project has independently produced a free Unix-"
 "like operating system.  This system is known as BSD, and it was developed at "
@@ -345,7 +416,7 @@
 "了自由软件。今天,一个自由的操作系统<a 
href=\"#newersystems\">(4)</a>差不多如"
 "果不是GNU系统的派生版本,就是BSD系统的派生版本。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People sometimes ask whether BSD too is a version of GNU, like GNU/Linux.  "
 "The BSD developers were inspired to make their code free software by the "
@@ -364,65 +435,100 @@
 "BSD的开发者并没编写一个内核,并将之添加
到GNU系统,进而起个譬如叫GNU/BSD的名"
 "字,并不是这个情况。<a href=\"#gnubsd\">(5)</a>"
 
-#. type: Content of: <div><div><h3>
-msgid "Notes"
-msgstr "注:"
-
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"unexciting\"></a>These unexciting but essential components include "
-"the GNU assembler (GAS) and the linker (GLD), both are now part of the <a "
-"href=\"/software/binutils/\">GNU Binutils</a> package, <a href=\"/software/"
-"tar/\">GNU tar</a>, and many more."
+# type: Content of: <h4>
+#. type: Content of: <div><h3>
+#, fuzzy
+#| msgid "Footnotes"
+msgid "Footnotes"
+msgstr "脚注"
+
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"unexciting\"></a>These unexciting but essential components "
+#| "include the GNU assembler (GAS) and the linker (GLD), both are now part "
+#| "of the <a href=\"/software/binutils/\">GNU Binutils</a> package, <a href="
+#| "\"/software/tar/\">GNU tar</a>, and many more."
+msgid ""
+"These unexciting but essential components include the GNU assembler (GAS) "
+"and the linker (GLD), both are now part of the <a href=\"/software/binutils/"
+"\">GNU Binutils</a> package, <a href=\"/software/tar/\">GNU tar</a>, and "
+"many more."
 msgstr ""
 "<a id=\"unexciting\"></a>这些关键但枯燥的部件包
括GNU汇编器(GAS)和连接器"
 "(GLD),他们现在都是<a href=\"/software/binutils/\">GNU 
Binutils</a>软件包的"
 "一部分,以及<a href=\"/software/tar/\">GNU tar</a>,还有å…
¶ä»–许多软件。"
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
-"PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
-"\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
-"library</a> are not programming tools.  Neither are GNUCash, GNOME, and GNU "
-"Chess."
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"nottools\"></a>For instance, The Bourne Again SHell (BASH), the "
+#| "PostScript interpreter <a href=\"/software/ghostscript/ghostscript.html"
+#| "\">Ghostscript</a>, and the <a href=\"/software/libc/libc.html\">GNU C "
+#| "library</a> are not programming tools.  Neither are GNUCash, GNOME, and "
+#| "GNU Chess."
+msgid ""
+"For instance, The Bourne Again SHell (BASH), the PostScript interpreter <a "
+"href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>, and the <a "
+"href=\"/software/libc/libc.html\">GNU C library</a> are not programming "
+"tools.  Neither are GNUCash, GNOME, and GNU Chess."
 msgstr ""
 "<a id=\"nottools\"></a>比如,Bourne Again 
SHell(BASH),PostScript解释器<a "
 "href=\"/software/ghostscript/ghostscript.html\">Ghostscript</a>,和<a href="
 "\"/software/libc/libc.html\">GNU C库</a>都不是编程工å…
·ã€‚GNUCash、GNOME和GNU "
 "Chess也不是。"
 
-#. type: Content of: <div><div><ol><li>
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/"
+#| "libc.html\">GNU C library</a>."
 msgid ""
-"<a id=\"somecomponents\"></a>For instance, the <a href=\"/software/libc/libc."
-"html\">GNU C library</a>."
+"For instance, the <a href=\"/software/libc/libc.html\">GNU C library</a>."
 msgstr ""
 "<a id=\"somecomponents\"></a>例如,<a 
href=\"/software/libc/libc.html\">GNU C"
 "库</a>。"
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"newersystems\"></a>Since that was written, a nearly-all-free Windows-"
-"like system has been developed, but technically it is not at all like GNU or "
-"Unix, so it doesn't really affect this issue.  Most of the kernel of Solaris "
-"has been made free, but if you wanted to make a free system out of that, "
-"aside from replacing the missing parts of the kernel, you would also need to "
-"put it into GNU or BSD."
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"newersystems\"></a>Since that was written, a nearly-all-free "
+#| "Windows-like system has been developed, but technically it is not at all "
+#| "like GNU or Unix, so it doesn't really affect this issue.  Most of the "
+#| "kernel of Solaris has been made free, but if you wanted to make a free "
+#| "system out of that, aside from replacing the missing parts of the kernel, "
+#| "you would also need to put it into GNU or BSD."
+msgid ""
+"Since that was written, a nearly-all-free Windows-like system has been "
+"developed, but technically it is not at all like GNU or Unix, so it doesn't "
+"really affect this issue.  Most of the kernel of Solaris has been made free, "
+"but if you wanted to make a free system out of that, aside from replacing "
+"the missing parts of the kernel, you would also need to put it into GNU or "
+"BSD."
 msgstr ""
 "<a id=\"newersystems\"></a>自从本文出版以来,有一个几乎完å…
¨è‡ªç”±çš„类似Windows"
 "的系统已经开发完成,但是从技术上说,它æ 
¹æœ¬ä¸åƒGNU或Unix,所以它不影响这个问"
 "题。Solaris内核的大部分都变成了自由软件,但是如果你要æ 
¹æ®è¿™äº›åˆ¶ä½œä¸€ä¸ªè‡ªç”±ç³»"
 "统,除了要添加内核缺少的部分,你还需要把它添加
到GNU或BSD中去。"
 
-#. type: Content of: <div><div><ol><li>
-msgid ""
-"<a id=\"gnubsd\"></a>On the other hand, in the years since this article was "
-"written, the GNU C Library has been ported to several versions of the BSD "
-"kernel, which made it straightforward to combine the GNU system with that "
-"kernel.  Just as with GNU/Linux, these are indeed variants of GNU, and are "
-"therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD depending on "
-"the kernel of the system.  Ordinary users on typical desktops can hardly "
-"distinguish between GNU/Linux and GNU/*BSD."
+#. type: Content of: <div><ol><li>
+#, fuzzy
+#| msgid ""
+#| "<a id=\"gnubsd\"></a>On the other hand, in the years since this article "
+#| "was written, the GNU C Library has been ported to several versions of the "
+#| "BSD kernel, which made it straightforward to combine the GNU system with "
+#| "that kernel.  Just as with GNU/Linux, these are indeed variants of GNU, "
+#| "and are therefore called, for instance, GNU/kFreeBSD and GNU/kNetBSD "
+#| "depending on the kernel of the system.  Ordinary users on typical "
+#| "desktops can hardly distinguish between GNU/Linux and GNU/*BSD."
+msgid ""
+"On the other hand, in the years since this article was written, the GNU C "
+"Library has been ported to several versions of the BSD kernel, which made it "
+"straightforward to combine the GNU system with that kernel.  Just as with "
+"GNU/Linux, these are indeed variants of GNU, and are therefore called, for "
+"instance, GNU/kFreeBSD and GNU/kNetBSD depending on the kernel of the "
+"system.  Ordinary users on typical desktops can hardly distinguish between "
+"GNU/Linux and GNU/*BSD."
 msgstr ""
 "<a id=\"gnubsd\"></a>另一方面,自从本文发表之后,GNU 
C库已经移植到多个BSD内核"
 "版本,这就使组合GNU系统和这些内æ 
¸å˜å¾—直截了当。正如GNU/Linux一样,这些也是GNU"
@@ -475,8 +581,11 @@
 "解有关协调和提交文章翻译的信息。"
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. "
+#| "Stallman"
+msgid "Copyright &copy; 1997-2002, 2005, 2008, 2019, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 1997-2002, 2007, 2014-2017, 2019, 2021 Richard M. Stallman"
 
@@ -504,6 +613,9 @@
 msgid "Updated:"
 msgstr "最后更新:"
 
+#~ msgid "Notes"
+#~ msgstr "注:"
+
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"

Index: gnu/po/why-gnu-linux.bg.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.bg.po,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- gnu/po/why-gnu-linux.bg.po  30 May 2021 18:30:21 -0000      1.33
+++ gnu/po/why-gnu-linux.bg.po  30 Aug 2021 13:34:54 -0000      1.34
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: why-gnu-linux.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2009-10-28 12:06+0200\n"
 "Last-Translator: Yavor Doganov <yavor@gnu.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -22,19 +22,61 @@
 msgid "Why GNU/Linux? - GNU Project - Free Software Foundation"
 msgstr "Защо GNU/Линукс? - Проектът GNU - Фондация 
за свободен софтуер"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "What's in a Name?"
 msgstr "Какво има в името?"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "от <a href=\"https://www.stallman.org/\";>Ричард 
Столман</a>"
 
+#. type: Content of: <div><p>
+# | Names convey meanings; our choice of names determines the meaning of what
+# | we say.  An inappropriate name gives people the wrong idea.  A rose by any
+# | other name would smell as sweet&mdash;but if you call it a pen, people
+# | will be rather disappointed when they try to write with it.  And if you
+# | call pens [-&ldquo;roses&rdquo;,-] {+&ldquo;roses,&rdquo;+} people may not
+# | realize what they are good for.  If you call our operating system Linux,
+# | that conveys a mistaken idea of the system's origin, history, and purpose.
+# |  If you call it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that
+# | conveys (though not in detail) an accurate idea.
+#, fuzzy
+#| msgid ""
+#| "Names convey meanings; our choice of names determines the meaning of what "
+#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
+#| "any other name would smell as sweet&mdash;but if you call it a pen, "
+#| "people will be rather disappointed when they try to write with it.  And "
+#| "if you call pens &ldquo;roses&rdquo;, people may not realize what they "
+#| "are good for.  If you call our operating system Linux, that conveys a "
+#| "mistaken idea of the system's origin, history, and purpose.  If you call "
+#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
+#| "(though not in detail) an accurate idea."
+msgid ""
+"Names convey meanings; our choice of names determines the meaning of what we "
+"say.  An inappropriate name gives people the wrong idea.  A rose by any "
+"other name would smell as sweet&mdash;but if you call it a pen, people will "
+"be rather disappointed when they try to write with it.  And if you call pens "
+"&ldquo;roses,&rdquo; people may not realize what they are good for.  If you "
+"call our operating system Linux, that conveys a mistaken idea of the "
+"system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
+"and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
+"accurate idea."
+msgstr ""
+"Имената изразяват значения — нашият 
избор на имена определя значението на "
+"това, което казваме.  Неподходящото име 
дава на хората грешна представа.  "
+"Една роза под каквото и да е име би ухаела х
убаво — но ако я наречете "
+"химикалка, хората ще са доста 
разочаровани, когато се опитат да пишат с "
+"нея.  Ако наричате химикалките „рози“, х
ората няма да осъзнават за какво са "
+"полезни те.  Ако наричате операционната 
система Линукс, това внушава "
+"погрешна представа за произхода, 
историята и целта на системата.  Ако я "
+"наричате <a href=\"/gnu/linux-and-gnu.html\">GNU/Линукс</a>, 
това дава "
+"представа (макар и не пълна) за вярната 
идея."
+
 #. type: Content of: <div><div><p>
 # | To learn more about this issue, you can [-also-] read our <a
 # | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
 # | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a> (the-]
-# | {+Project</a>, which gives a+} history of the GNU/Linux system as it
+# | {+System</a>, which gives a+} history of the GNU/Linux system as it
 # | relates to this issue of naming[-)-], and our page on <a
 # | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
 # | Heard of GNU</a>.
@@ -49,7 +91,7 @@
 msgid ""
 "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
 "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>, which gives a history of the GNU/Linux "
+"\">Linux and the GNU System</a>, which gives a history of the GNU/Linux "
 "system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
 "gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
 "a>."
@@ -63,38 +105,6 @@
 
 #. type: Content of: <div><p>
 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>."
-msgstr ""
-"Това есе е публикувано в книгата <a 
href=\"http://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Свободен софтуер, 
свободно общество: избрани "
-"есета от Ричард М. Столман</cite></a>."
-
-#. type: Content of: <div><div><p>
-msgid ""
-"Names convey meanings; our choice of names determines the meaning of what we "
-"say.  An inappropriate name gives people the wrong idea.  A rose by any "
-"other name would smell as sweet&mdash;but if you call it a pen, people will "
-"be rather disappointed when they try to write with it.  And if you call pens "
-"&ldquo;roses&rdquo;, people may not realize what they are good for.  If you "
-"call our operating system Linux, that conveys a mistaken idea of the "
-"system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
-"and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
-"accurate idea."
-msgstr ""
-"Имената изразяват значения — нашият 
избор на имена определя значението на "
-"това, което казваме.  Неподходящото име 
дава на хората грешна представа.  "
-"Една роза под каквото и да е име би ухаела х
убаво — но ако я наречете "
-"химикалка, хората ще са доста 
разочаровани, когато се опитат да пишат с "
-"нея.  Ако наричате химикалките „рози“, х
ората няма да осъзнават за какво са "
-"полезни те.  Ако наричате операционната 
система Линукс, това внушава "
-"погрешна представа за произхода, 
историята и целта на системата.  Ако я "
-"наричате <a href=\"/gnu/linux-and-gnu.html\">GNU/Линукс</a>, 
това дава "
-"представа (макар и не пълна) за вярната 
идея."
-
-#. type: Content of: <div><div><p>
-msgid ""
 "Does this really matter for our community? Is it important whether people "
 "know the system's origin, history, and purpose? Yes&mdash;because people who "
 "forget history are often condemned to repeat it.  The Free World that has "
@@ -109,7 +119,7 @@
 "гарантиран да оцелее; проблемите, които ни 
подтикнаха да разработим GNU, не "
 "са напълно изкоренени и заплашват да се 
върнат обратно."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
@@ -117,7 +127,7 @@
 "Когато обяснявам защо е уместно 
операционната система да се нарича GNU/"
 "Линукс вместо Линукс, хората понякога 
отговарят по този начин:"
 
-#. type: Content of: <div><div><blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "<em> Granted that the GNU Project deserves credit for this work, is it "
 "really worth a fuss when people don't give credit? Isn't the important thing "
@@ -130,7 +140,7 @@
 "си отдъхнете, да се гордеете с добре 
свършената работа и да не се безпокоите "
 "за заслугите.</em>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "This would be wise advice, if only the situation were like that&mdash;if the "
 "job were done and it were time to relax.  If only that were true! But "
@@ -147,7 +157,7 @@
 "\">GNU/Линукс</a> е начин хората да си напомнят 
това и да осведомяват "
 "останалите за тези цели."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "It is possible to write good free software without thinking of GNU; much "
 "good work has been done in the name of Linux also.  But the term &ldquo;"
@@ -163,7 +173,27 @@
 "в бизнеса, ще имаме дори още повече 
проблеми да го свързваме с общностния "
 "дух."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | A great challenge to the future of free software comes from the tendency
+# | of the &ldquo;Linux&rdquo; distribution companies to add nonfree software
+# | to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of
+# | convenience and power.  All the major commercial distribution developers
+# | do this; none limits itself to free software.  Most of them do not clearly
+# | identify the nonfree packages in their distributions.  Many even develop
+# | nonfree software and add it to the system.  Some outrageously advertise
+# | &ldquo;Linux&rdquo; systems that are &ldquo;licensed per [-seat&rdquo;,-]
+# | {+seat,&rdquo;+} which give the user as much freedom as Microsoft Windows.
+#, fuzzy
+#| msgid ""
+#| "A great challenge to the future of free software comes from the tendency "
+#| "of the &ldquo;Linux&rdquo; distribution companies to add nonfree software "
+#| "to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of "
+#| "convenience and power.  All the major commercial distribution developers "
+#| "do this; none limits itself to free software.  Most of them do not "
+#| "clearly identify the nonfree packages in their distributions.  Many even "
+#| "develop nonfree software and add it to the system.  Some outrageously "
+#| "advertise &ldquo;Linux&rdquo; systems that are &ldquo;licensed per "
+#| "seat&rdquo;, which give the user as much freedom as Microsoft Windows."
 msgid ""
 "A great challenge to the future of free software comes from the tendency of "
 "the &ldquo;Linux&rdquo; distribution companies to add nonfree software to <a "
@@ -172,7 +202,7 @@
 "limits itself to free software.  Most of them do not clearly identify the "
 "nonfree packages in their distributions.  Many even develop nonfree software "
 "and add it to the system.  Some outrageously advertise &ldquo;Linux&rdquo; "
-"systems that are &ldquo;licensed per seat&rdquo;, which give the user as "
+"systems that are &ldquo;licensed per seat,&rdquo; which give the user as "
 "much freedom as Microsoft Windows."
 msgstr ""
 "Голямо предизвикателство за бъдещето на 
свободния софтуер идва от "
@@ -186,7 +216,29 @@
 "рекламират „Линукс“ системи, 
лицензирани „за инсталация“, които 
предоставят "
 "на потребителите толкова свобода, колкото 
и „Майкрософт Уиндоус“."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People try to justify adding nonfree software in the name of the
+# | &ldquo;popularity of Linux&rdquo;&mdash;in effect, valuing popularity
+# | above freedom.  Sometimes this is openly admitted.  For instance, Wired
+# | Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;feels
+# | that the move toward open source software should be fueled by technical,
+# | rather than political, decisions.&rdquo; And Caldera's <abbr title=\"Chief
+# | Executive Officer\">CEO</abbr> openly urged users to <a
+# | href=\"http{+s+}://www.zdnet.com/article/stallman-love-is-not-free/\">drop
+# | the goal of freedom and work instead for the &ldquo;popularity of
+# | Linux&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "People try to justify adding nonfree software in the name of the &ldquo;"
+#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
+#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
+#| "Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;"
+#| "feels that the move toward open source software should be fueled by "
+#| "technical, rather than political, decisions.&rdquo; And Caldera's <abbr "
+#| "title=\"Chief Executive Officer\">CEO</abbr> openly urged users to <a "
+#| "href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
+#| "goal of freedom and work instead for the &ldquo;popularity of Linux&rdquo;"
+#| "</a>."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -194,7 +246,7 @@
 "said that Robert McMillan, editor of Linux Magazine, &ldquo;feels that the "
 "move toward open source software should be fueled by technical, rather than "
 "political, decisions.&rdquo; And Caldera's <abbr title=\"Chief Executive "
-"Officer\">CEO</abbr> openly urged users to <a href=\"http://www.zdnet.com/";
+"Officer\">CEO</abbr> openly urged users to <a href=\"https://www.zdnet.com/";
 "article/stallman-love-is-not-free/\">drop the goal of freedom and work "
 "instead for the &ldquo;popularity of Linux&rdquo;</a>."
 msgstr ""
@@ -208,7 +260,7 @@
 "free/\">изоставят стемежа към свобода и да 
работят за „популярността на "
 "Линукс“</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -226,7 +278,7 @@
 "софтуер като нещо хубаво, и да забрави 
стремежа към свобода.  Не е добре да "
 "караш по-бързо, ако не можеш да се задържиш 
на пътя."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, it
 # | can become a trap for free software developers.  When they write free
 # | software that depends on the nonfree package, their software cannot be
@@ -271,7 +323,7 @@
 "philosophy/java-trap.html\">„клопката на Джава“</a>, за 
щастие вече извън "
 "действие."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -288,7 +340,7 @@
 "заедно с него.  Ако това се случи, нашата 
кампания за свобода би била "
 "провалена."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -313,7 +365,7 @@
 "против патентованите и секретни формати 
за данни, освен <strong>да отхвърлим "
 "несвободните програми, които ги 
използват</strong>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -332,7 +384,7 @@
 "свободата си и за общността си — 
решителност да продължаваме с години и да "
 "не се отказваме."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "In our community, this goal and this determination emanate mainly from the "
 "GNU Project.  We're the ones who talk about freedom and community as "
@@ -357,19 +409,39 @@
 "където хора от нашата общност могат да 
попаднат на идеята за свобода и "
 "непоколебимост е в проекта GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid "But when people come across it, will they feel it relates to them?"
 msgstr ""
 "Но когато хората попаднат на него, ще 
почувстват ли, че се отнася до тях?"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People who know they are using a system that came out of the GNU Project
+# | can see a direct relationship between themselves and GNU.  They won't
+# | automatically agree with our philosophy, but at least they will see a
+# | reason to think seriously about it.  In contrast, people who consider
+# | themselves &ldquo;Linux [-users&rdquo;,-] {+users,&rdquo;+} and believe
+# | that the GNU Project &ldquo;developed tools which proved to be useful in
+# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} typically perceive only an indirect
+# | relationship between GNU and themselves.  They may just ignore the GNU
+# | philosophy when they come across it.
+#, fuzzy
+#| msgid ""
+#| "People who know they are using a system that came out of the GNU Project "
+#| "can see a direct relationship between themselves and GNU.  They won't "
+#| "automatically agree with our philosophy, but at least they will see a "
+#| "reason to think seriously about it.  In contrast, people who consider "
+#| "themselves &ldquo;Linux users&rdquo;, and believe that the GNU Project "
+#| "&ldquo;developed tools which proved to be useful in Linux&rdquo;, "
+#| "typically perceive only an indirect relationship between GNU and "
+#| "themselves.  They may just ignore the GNU philosophy when they come "
+#| "across it."
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
 "automatically agree with our philosophy, but at least they will see a reason "
 "to think seriously about it.  In contrast, people who consider themselves "
-"&ldquo;Linux users&rdquo;, and believe that the GNU Project &ldquo;developed "
-"tools which proved to be useful in Linux&rdquo;, typically perceive only an "
+"&ldquo;Linux users,&rdquo; and believe that the GNU Project &ldquo;developed "
+"tools which proved to be useful in Linux,&rdquo; typically perceive only an "
 "indirect relationship between GNU and themselves.  They may just ignore the "
 "GNU philosophy when they come across it."
 msgstr ""
@@ -381,11 +453,26 @@
 "за Линукс“, обикновено възприемат само 
непряка връзка между себе си и GNU.  "
 "Те може просто да пренебрегнат 
философията на GNU, когато попаднат на нея."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project is idealistic, and anyone encouraging idealism today faces
+# | a great obstacle: the prevailing ideology encourages people to dismiss
+# | idealism as [-&ldquo;impractical&rdquo;.-] {+&ldquo;impractical.&rdquo;+}
+# | Our idealism has been extremely practical: it is the reason we have a free
+# | <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> operating system. 
+# | People who love this system ought to know that it is our idealism made
+# | real.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project is idealistic, and anyone encouraging idealism today "
+#| "faces a great obstacle: the prevailing ideology encourages people to "
+#| "dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been "
+#| "extremely practical: it is the reason we have a free <a href=\"/gnu/linux-"
+#| "and-gnu.html\">GNU/Linux</a> operating system.  People who love this "
+#| "system ought to know that it is our idealism made real."
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
-"idealism as &ldquo;impractical&rdquo;.  Our idealism has been extremely "
+"idealism as &ldquo;impractical.&rdquo; Our idealism has been extremely "
 "practical: it is the reason we have a free <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> operating system.  People who love this system ought to "
 "know that it is our idealism made real."
@@ -398,7 +485,7 @@
 "обичат тази система, би трябвало да знаят, 
че тя е нашия идеализъм, "
 "реализиран на практика."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If &ldquo;the job&rdquo; really were done, if there were nothing at stake "
 "except credit, perhaps it would be wiser to let the matter drop.  But we are "
@@ -414,6 +501,25 @@
 "помогнете ни, като наричате операционната 
система <a href=\"/gnu/linux-and-"
 "gnu.html\">GNU/Линукс</a>."
 
+#. type: Content of: <div><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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Това есе е публикувано в книгата <a 
href=\"http://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Свободен софтуер, 
свободно общество: избрани "
+"есета от Ричард М. Столман</cite></a>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -458,8 +564,7 @@
 
 #. type: Content of: <div><p>
 #, fuzzy
-msgid ""
-"Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
 msgstr "Copyright &copy; 2000, 2006, 2007  Richard Stallman (Ричард 
Столман)"
 
 #. type: Content of: <div><p>
@@ -485,6 +590,15 @@
 msgstr "Последно обновяване:"
 
 #~ 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>."
+#~ msgstr ""
+#~ "Това есе е публикувано в книгата <a 
href=\"http://shop.fsf.org/product/";
+#~ "free-software-free-society/\"><cite>Свободен софтуер, 
свободно общество: "
+#~ "избрани есета от Ричард М. Столман</cite></a>."
+
+#~ msgid ""
 #~ "PS: For an explanation of the history of the GNU/Linux system as it "
 #~ "relates to this issue of naming, see <a href=\"/gnu/linux-and-gnu.html"
 #~ "\">http://www.gnu.org/gnu/linux-and-gnu.html</a>.  For answers to other "

Index: gnu/po/why-gnu-linux.ca.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.ca.po,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- gnu/po/why-gnu-linux.ca.po  7 Jun 2021 08:29:31 -0000       1.52
+++ gnu/po/why-gnu-linux.ca.po  30 Aug 2021 13:34:54 -0000      1.53
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: why-gnu-linux.html\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2016-04-23 18:30+0200\n"
 "Last-Translator: Miquel Puigpelat <mpuigpe1@xtec.cat>\n"
 "Language-Team: Catalan <www-ca-traductors@gnu.org>\n"
@@ -16,52 +16,47 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 
 #. type: Content of: <title>
 msgid "Why GNU/Linux? - GNU Project - Free Software Foundation"
 msgstr "Per què GNU/Linux? - Projecte GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "What's in a Name?"
 msgstr "Què hi ha en un nom?"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "per <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
-"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>, which gives a history of the GNU/Linux "
-"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Per saber més sobre aquesta qüestió podeu llegir les nostres <a 
href=\"/gnu/"
-"gnu-linux-faq.html\"> preguntes freqüents sobre GNU/Linux</a>, la nostra "
-"pàgina sobre <a href=\"/gnu/linux-and-gnu.html\"> Linux i el Projecte GNU</"
-"a>, que explica la història del sistema GNU/Linux en relació amb el seu 
nom, "
-"i la pàgina sobre  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> "
-"Usuaris de GNU que mai no han sentit parlar de GNU</a>."
-
 #. type: Content of: <div><p>
-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>."
-msgstr ""
-"Aquest assaig s'ha publicat al llibre <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>."
-
-#. type: Content of: <div><div><p>
+# | Names convey meanings; our choice of names determines the meaning of what
+# | we say.  An inappropriate name gives people the wrong idea.  A rose by any
+# | other name would smell as sweet&mdash;but if you call it a pen, people
+# | will be rather disappointed when they try to write with it.  And if you
+# | call pens [-&ldquo;roses&rdquo;,-] {+&ldquo;roses,&rdquo;+} people may not
+# | realize what they are good for.  If you call our operating system Linux,
+# | that conveys a mistaken idea of the system's origin, history, and purpose.
+# |  If you call it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that
+# | conveys (though not in detail) an accurate idea.
+#, fuzzy
+#| msgid ""
+#| "Names convey meanings; our choice of names determines the meaning of what "
+#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
+#| "any other name would smell as sweet&mdash;but if you call it a pen, "
+#| "people will be rather disappointed when they try to write with it.  And "
+#| "if you call pens &ldquo;roses&rdquo;, people may not realize what they "
+#| "are good for.  If you call our operating system Linux, that conveys a "
+#| "mistaken idea of the system's origin, history, and purpose.  If you call "
+#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
+#| "(though not in detail) an accurate idea."
 msgid ""
 "Names convey meanings; our choice of names determines the meaning of what we "
 "say.  An inappropriate name gives people the wrong idea.  A rose by any "
 "other name would smell as sweet&mdash;but if you call it a pen, people will "
 "be rather disappointed when they try to write with it.  And if you call pens "
-"&ldquo;roses&rdquo;, people may not realize what they are good for.  If you "
+"&ldquo;roses,&rdquo; people may not realize what they are good for.  If you "
 "call our operating system Linux, that conveys a mistaken idea of the "
 "system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
 "and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
@@ -79,6 +74,37 @@
 "idea més precisa."
 
 #. type: Content of: <div><div><p>
+# | To learn more about this issue, you can read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
+# | {+System</a>,+} which gives a history of the GNU/Linux system as it
+# | relates to this issue of naming, and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+#| "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu."
+#| "html\">Linux and the GNU Project</a>, which gives a history of the GNU/"
+#| "Linux system as it relates to this issue of naming, and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>, which gives a history of the GNU/Linux "
+"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Per saber més sobre aquesta qüestió podeu llegir les nostres <a 
href=\"/gnu/"
+"gnu-linux-faq.html\"> preguntes freqüents sobre GNU/Linux</a>, la nostra "
+"pàgina sobre <a href=\"/gnu/linux-and-gnu.html\"> Linux i el Projecte GNU</"
+"a>, que explica la història del sistema GNU/Linux en relació amb el seu 
nom, "
+"i la pàgina sobre  <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\"> "
+"Usuaris de GNU que mai no han sentit parlar de GNU</a>."
+
+#. type: Content of: <div><p>
 msgid ""
 "Does this really matter for our community? Is it important whether people "
 "know the system's origin, history, and purpose? Yes&mdash;because people who "
@@ -95,7 +121,7 @@
 "van portar a desenvolupar GNU no estan completament eradicats i amenacen amb "
 "tornar."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
@@ -103,7 +129,7 @@
 "Quan explico per què és més apropiat anomenar al sistema operatiu 
GNU/Linux "
 "en comptes de Linux, la gent de vegades em respon d'aquesta forma:"
 
-#. type: Content of: <div><div><blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "<em> Granted that the GNU Project deserves credit for this work, is it "
 "really worth a fuss when people don't give credit? Isn't the important thing "
@@ -116,7 +142,7 @@
 "de relaxar-te, sentir-te orgullós per la feina ben feta, i no preocupar-te "
 "del reconeixement.</em>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "This would be wise advice, if only the situation were like that&mdash;if the "
 "job were done and it were time to relax.  If only that were true! But "
@@ -133,7 +159,7 @@
 "linux-and-gnu.html\">GNU/Linux</a> és una forma de recordar-ho i d'informar "
 "els altres sobre aquests objectius."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "It is possible to write good free software without thinking of GNU; much "
 "good work has been done in the name of Linux also.  But the term &ldquo;"
@@ -149,7 +175,27 @@
 "la llarga ens serà fins i tot més difícil fer que connecti amb l'esperit 
de "
 "la comunitat."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | A great challenge to the future of free software comes from the tendency
+# | of the &ldquo;Linux&rdquo; distribution companies to add nonfree software
+# | to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of
+# | convenience and power.  All the major commercial distribution developers
+# | do this; none limits itself to free software.  Most of them do not clearly
+# | identify the nonfree packages in their distributions.  Many even develop
+# | nonfree software and add it to the system.  Some outrageously advertise
+# | &ldquo;Linux&rdquo; systems that are &ldquo;licensed per [-seat&rdquo;,-]
+# | {+seat,&rdquo;+} which give the user as much freedom as Microsoft Windows.
+#, fuzzy
+#| msgid ""
+#| "A great challenge to the future of free software comes from the tendency "
+#| "of the &ldquo;Linux&rdquo; distribution companies to add nonfree software "
+#| "to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of "
+#| "convenience and power.  All the major commercial distribution developers "
+#| "do this; none limits itself to free software.  Most of them do not "
+#| "clearly identify the nonfree packages in their distributions.  Many even "
+#| "develop nonfree software and add it to the system.  Some outrageously "
+#| "advertise &ldquo;Linux&rdquo; systems that are &ldquo;licensed per "
+#| "seat&rdquo;, which give the user as much freedom as Microsoft Windows."
 msgid ""
 "A great challenge to the future of free software comes from the tendency of "
 "the &ldquo;Linux&rdquo; distribution companies to add nonfree software to <a "
@@ -158,7 +204,7 @@
 "limits itself to free software.  Most of them do not clearly identify the "
 "nonfree packages in their distributions.  Many even develop nonfree software "
 "and add it to the system.  Some outrageously advertise &ldquo;Linux&rdquo; "
-"systems that are &ldquo;licensed per seat&rdquo;, which give the user as "
+"systems that are &ldquo;licensed per seat,&rdquo; which give the user as "
 "much freedom as Microsoft Windows."
 msgstr ""
 "Un gran repte per al futur del programari lliure prové de la tendència de "
@@ -172,7 +218,29 @@
 "sistemes «Linux» amb «llicència per a ordinador individual», cosa que 
dóna a "
 "l'usuari tanta llibertat com utilitzar Microsoft Windows."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People try to justify adding nonfree software in the name of the
+# | &ldquo;popularity of Linux&rdquo;&mdash;in effect, valuing popularity
+# | above freedom.  Sometimes this is openly admitted.  For instance, Wired
+# | Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;feels
+# | that the move toward open source software should be fueled by technical,
+# | rather than political, decisions.&rdquo; And Caldera's <abbr title=\"Chief
+# | Executive Officer\">CEO</abbr> openly urged users to <a
+# | href=\"http{+s+}://www.zdnet.com/article/stallman-love-is-not-free/\">drop
+# | the goal of freedom and work instead for the &ldquo;popularity of
+# | Linux&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "People try to justify adding nonfree software in the name of the &ldquo;"
+#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
+#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
+#| "Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;"
+#| "feels that the move toward open source software should be fueled by "
+#| "technical, rather than political, decisions.&rdquo; And Caldera's <abbr "
+#| "title=\"Chief Executive Officer\">CEO</abbr> openly urged users to <a "
+#| "href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
+#| "goal of freedom and work instead for the &ldquo;popularity of Linux&rdquo;"
+#| "</a>."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -180,7 +248,7 @@
 "said that Robert McMillan, editor of Linux Magazine, &ldquo;feels that the "
 "move toward open source software should be fueled by technical, rather than "
 "political, decisions.&rdquo; And Caldera's <abbr title=\"Chief Executive "
-"Officer\">CEO</abbr> openly urged users to <a href=\"http://www.zdnet.com/";
+"Officer\">CEO</abbr> openly urged users to <a href=\"https://www.zdnet.com/";
 "article/stallman-love-is-not-free/\">drop the goal of freedom and work "
 "instead for the &ldquo;popularity of Linux&rdquo;</a>."
 msgstr ""
@@ -194,7 +262,7 @@
 "stallman-love-is-not-free/\">abandonar l'objectiu de la llibertat i a "
 "treballar en canvi per la «popularitat de Linux»</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -212,7 +280,7 @@
 "lliure com una cosa bona, i a oblidar l'objectiu de la llibertat. No serveix "
 "de res conduir més de pressa si no pots mantenir-te a la carretera."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, it "
 "can become a trap for free software developers.  When they write free "
@@ -236,7 +304,7 @@
 "philosophy/java-trap.html\">trampa de Java</a>, situació que afortunadament "
 "es troba ara redreçada."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -252,7 +320,7 @@
 "se sense el programari no lliure que els usuaris esperen trobar amb ell. Si "
 "això passa, la nostra campanya per la llibertat haurà fracassat."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -276,7 +344,7 @@
 "contra els formats de dades secrets i patentats que no sigui "
 "<strong>rebutjar els programes no lliures que els utilitzen</strong>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -294,7 +362,7 @@
 "la seva llibertat i per la seva comunitat, la determinació de continuar "
 "lluitant any rere any sense rendir-se."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "In our community, this goal and this determination emanate mainly from the "
 "GNU Project.  We're the ones who talk about freedom and community as "
@@ -320,18 +388,38 @@
 "nostra comunitat trobin aquesta idea de llibertat i determinació és el "
 "Projecte GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid "But when people come across it, will they feel it relates to them?"
 msgstr "Però quan la trobin, s'hi sentiran identificats?"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People who know they are using a system that came out of the GNU Project
+# | can see a direct relationship between themselves and GNU.  They won't
+# | automatically agree with our philosophy, but at least they will see a
+# | reason to think seriously about it.  In contrast, people who consider
+# | themselves &ldquo;Linux [-users&rdquo;,-] {+users,&rdquo;+} and believe
+# | that the GNU Project &ldquo;developed tools which proved to be useful in
+# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} typically perceive only an indirect
+# | relationship between GNU and themselves.  They may just ignore the GNU
+# | philosophy when they come across it.
+#, fuzzy
+#| msgid ""
+#| "People who know they are using a system that came out of the GNU Project "
+#| "can see a direct relationship between themselves and GNU.  They won't "
+#| "automatically agree with our philosophy, but at least they will see a "
+#| "reason to think seriously about it.  In contrast, people who consider "
+#| "themselves &ldquo;Linux users&rdquo;, and believe that the GNU Project "
+#| "&ldquo;developed tools which proved to be useful in Linux&rdquo;, "
+#| "typically perceive only an indirect relationship between GNU and "
+#| "themselves.  They may just ignore the GNU philosophy when they come "
+#| "across it."
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
 "automatically agree with our philosophy, but at least they will see a reason "
 "to think seriously about it.  In contrast, people who consider themselves "
-"&ldquo;Linux users&rdquo;, and believe that the GNU Project &ldquo;developed "
-"tools which proved to be useful in Linux&rdquo;, typically perceive only an "
+"&ldquo;Linux users,&rdquo; and believe that the GNU Project &ldquo;developed "
+"tools which proved to be useful in Linux,&rdquo; typically perceive only an "
 "indirect relationship between GNU and themselves.  They may just ignore the "
 "GNU philosophy when they come across it."
 msgstr ""
@@ -344,11 +432,26 @@
 "relació indirecta entre GNU i ells mateixos. Poden simplement ignorar la "
 "filosofia del Projecte GNU quan es trobin amb ella."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project is idealistic, and anyone encouraging idealism today faces
+# | a great obstacle: the prevailing ideology encourages people to dismiss
+# | idealism as [-&ldquo;impractical&rdquo;.-] {+&ldquo;impractical.&rdquo;+}
+# | Our idealism has been extremely practical: it is the reason we have a free
+# | <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> operating system. 
+# | People who love this system ought to know that it is our idealism made
+# | real.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project is idealistic, and anyone encouraging idealism today "
+#| "faces a great obstacle: the prevailing ideology encourages people to "
+#| "dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been "
+#| "extremely practical: it is the reason we have a free <a href=\"/gnu/linux-"
+#| "and-gnu.html\">GNU/Linux</a> operating system.  People who love this "
+#| "system ought to know that it is our idealism made real."
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
-"idealism as &ldquo;impractical&rdquo;.  Our idealism has been extremely "
+"idealism as &ldquo;impractical.&rdquo; Our idealism has been extremely "
 "practical: it is the reason we have a free <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> operating system.  People who love this system ought to "
 "know that it is our idealism made real."
@@ -361,7 +464,7 @@
 "agrada molt aquest sistema hauria de saber que és el nostre idealisme fet "
 "realitat."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If &ldquo;the job&rdquo; really were done, if there were nothing at stake "
 "except credit, perhaps it would be wiser to let the matter drop.  But we are "
@@ -377,6 +480,25 @@
 "anomenant <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> al sistema "
 "operatiu."
 
+#. type: Content of: <div><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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Aquest assaig s'ha publicat al llibre <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>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -420,8 +542,12 @@
 "traducció al català del web de GNU."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+# | Copyright &copy; 2000, [-2006,-] 2007, [-2014-2016, 2020,-] 2021 Richard
+# | Stallman
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
 
@@ -448,6 +574,15 @@
 msgstr "Updated:"
 
 #~ 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>."
+#~ msgstr ""
+#~ "Aquest assaig s'ha publicat al llibre <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 ""
 #~ "P.S. For an explanation of the history of the GNU/Linux system as it "
 #~ "relates to this issue of naming, see <a href=\"/gnu/linux-and-gnu.html"
 #~ "\">http://www.gnu.org/gnu/linux-and-gnu.html</a>.  For answers to other "

Index: gnu/po/why-gnu-linux.cs.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.cs.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- gnu/po/why-gnu-linux.cs.po  7 Jun 2021 08:29:32 -0000       1.20
+++ gnu/po/why-gnu-linux.cs.po  30 Aug 2021 13:34:54 -0000      1.21
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: why-gnu-linux.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2012-07-08 19:40+0200\n"
 "Last-Translator: František Kučera <franta-gnu@frantovo.cz>\n"
 "Language-Team: Czech <www-cs-general@gnu.org>\n"
@@ -16,6 +16,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
@@ -23,47 +24,41 @@
 msgid "Why GNU/Linux? - GNU Project - Free Software Foundation"
 msgstr "Proč GNU/Linux? – Projekt GNU – Nadace pro svobodný software"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "What's in a Name?"
 msgstr "O co jde v názvu?"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "od <a href=\"https://www.stallman.org/\";>Richarda Stallmana</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
-"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>, which gives a history of the GNU/Linux "
-"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Pro více informací o tomto tématu si přečtěte <a 
href=\"/gnu/gnu-linux-faq."
-"html\">GNU/Linux FAQ</a>, naši stránku <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux a projekt GNU </a>, která pojednává o historii systému GNU/Linux 
a "
-"vztahuje se k otázce tohoto pojmenování a naši stránku <a 
href=\"/gnu/gnu-"
-"users-never-heard-of-gnu.html\">GNU uživatelé, kteří nikdy neslyšeli o 
GNU</"
-"a>."
-
 #. type: Content of: <div><p>
-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>."
-msgstr ""
-"Tato esej vyšla v knize <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>."
-
-#. type: Content of: <div><div><p>
+# | Names convey meanings; our choice of names determines the meaning of what
+# | we say.  An inappropriate name gives people the wrong idea.  A rose by any
+# | other name would smell as sweet&mdash;but if you call it a pen, people
+# | will be rather disappointed when they try to write with it.  And if you
+# | call pens [-&ldquo;roses&rdquo;,-] {+&ldquo;roses,&rdquo;+} people may not
+# | realize what they are good for.  If you call our operating system Linux,
+# | that conveys a mistaken idea of the system's origin, history, and purpose.
+# |  If you call it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that
+# | conveys (though not in detail) an accurate idea.
+#, fuzzy
+#| msgid ""
+#| "Names convey meanings; our choice of names determines the meaning of what "
+#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
+#| "any other name would smell as sweet&mdash;but if you call it a pen, "
+#| "people will be rather disappointed when they try to write with it.  And "
+#| "if you call pens &ldquo;roses&rdquo;, people may not realize what they "
+#| "are good for.  If you call our operating system Linux, that conveys a "
+#| "mistaken idea of the system's origin, history, and purpose.  If you call "
+#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
+#| "(though not in detail) an accurate idea."
 msgid ""
 "Names convey meanings; our choice of names determines the meaning of what we "
 "say.  An inappropriate name gives people the wrong idea.  A rose by any "
 "other name would smell as sweet&mdash;but if you call it a pen, people will "
 "be rather disappointed when they try to write with it.  And if you call pens "
-"&ldquo;roses&rdquo;, people may not realize what they are good for.  If you "
+"&ldquo;roses,&rdquo; people may not realize what they are good for.  If you "
 "call our operating system Linux, that conveys a mistaken idea of the "
 "system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
 "and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
@@ -80,6 +75,37 @@
 "doopravdy."
 
 #. type: Content of: <div><div><p>
+# | To learn more about this issue, you can read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
+# | {+System</a>,+} which gives a history of the GNU/Linux system as it
+# | relates to this issue of naming, and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+#| "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu."
+#| "html\">Linux and the GNU Project</a>, which gives a history of the GNU/"
+#| "Linux system as it relates to this issue of naming, and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>, which gives a history of the GNU/Linux "
+"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Pro více informací o tomto tématu si přečtěte <a 
href=\"/gnu/gnu-linux-faq."
+"html\">GNU/Linux FAQ</a>, naši stránku <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux a projekt GNU </a>, která pojednává o historii systému GNU/Linux 
a "
+"vztahuje se k otázce tohoto pojmenování a naši stránku <a 
href=\"/gnu/gnu-"
+"users-never-heard-of-gnu.html\">GNU uživatelé, kteří nikdy neslyšeli o 
GNU</"
+"a>."
+
+#. type: Content of: <div><p>
 msgid ""
 "Does this really matter for our community? Is it important whether people "
 "know the system's origin, history, and purpose? Yes&mdash;because people who "
@@ -95,7 +121,7 @@
 "které nás vedly k vyvinutí GNU, nejsou ještě zažehnány a pořád 
hrozí, že se "
 "vrátí."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
@@ -103,7 +129,7 @@
 "Když vysvětluji, proč bychom měli systém nazývat „GNU/Linux“ místo 
„Linux“, "
 "lidé občas odpovídají:"
 
-#. type: Content of: <div><div><blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "<em> Granted that the GNU Project deserves credit for this work, is it "
 "really worth a fuss when people don't give credit? Isn't the important thing "
@@ -115,7 +141,7 @@
 "dokončena, než kdo ji dokončil? Měli byste spíše odpočívat a být 
hrdí, že "
 "jste odvedli dobrou práci, a ne se starat o zásluhy.</em>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "This would be wise advice, if only the situation were like that&mdash;if the "
 "job were done and it were time to relax.  If only that were true! But "
@@ -131,7 +157,7 @@
 "a spolupráci. Používání jména <a 
href=\"/gnu/linux-and-gnu.html\">GNU/Linux</"
 "a> je způsob, jak si připomenout naše cíle a informovat o nich i 
ostatní."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "It is possible to write good free software without thinking of GNU; much "
 "good work has been done in the name of Linux also.  But the term &ldquo;"
@@ -146,7 +172,27 @@
 "Tím, jak toto jméno více a více používají obchodníci, bude pro nás 
stále "
 "těžší spojit ho s duchem a myšlenkami naší komunity."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | A great challenge to the future of free software comes from the tendency
+# | of the &ldquo;Linux&rdquo; distribution companies to add nonfree software
+# | to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of
+# | convenience and power.  All the major commercial distribution developers
+# | do this; none limits itself to free software.  Most of them do not clearly
+# | identify the nonfree packages in their distributions.  Many even develop
+# | nonfree software and add it to the system.  Some outrageously advertise
+# | &ldquo;Linux&rdquo; systems that are &ldquo;licensed per [-seat&rdquo;,-]
+# | {+seat,&rdquo;+} which give the user as much freedom as Microsoft Windows.
+#, fuzzy
+#| msgid ""
+#| "A great challenge to the future of free software comes from the tendency "
+#| "of the &ldquo;Linux&rdquo; distribution companies to add nonfree software "
+#| "to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of "
+#| "convenience and power.  All the major commercial distribution developers "
+#| "do this; none limits itself to free software.  Most of them do not "
+#| "clearly identify the nonfree packages in their distributions.  Many even "
+#| "develop nonfree software and add it to the system.  Some outrageously "
+#| "advertise &ldquo;Linux&rdquo; systems that are &ldquo;licensed per "
+#| "seat&rdquo;, which give the user as much freedom as Microsoft Windows."
 msgid ""
 "A great challenge to the future of free software comes from the tendency of "
 "the &ldquo;Linux&rdquo; distribution companies to add nonfree software to <a "
@@ -155,7 +201,7 @@
 "limits itself to free software.  Most of them do not clearly identify the "
 "nonfree packages in their distributions.  Many even develop nonfree software "
 "and add it to the system.  Some outrageously advertise &ldquo;Linux&rdquo; "
-"systems that are &ldquo;licensed per seat&rdquo;, which give the user as "
+"systems that are &ldquo;licensed per seat,&rdquo; which give the user as "
 "much freedom as Microsoft Windows."
 msgstr ""
 "Velkou výzvou pro svobodný software do budoucnosti je tendence 
společností "
@@ -167,7 +213,29 @@
 "Někteří dokonce inzerují systém „Linux“, který je „licencovaný 
podle počtu "
 "uživatelů“, což dává uživateli stejně svobody jako Microsoft 
Windows."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People try to justify adding nonfree software in the name of the
+# | &ldquo;popularity of Linux&rdquo;&mdash;in effect, valuing popularity
+# | above freedom.  Sometimes this is openly admitted.  For instance, Wired
+# | Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;feels
+# | that the move toward open source software should be fueled by technical,
+# | rather than political, decisions.&rdquo; And Caldera's <abbr title=\"Chief
+# | Executive Officer\">CEO</abbr> openly urged users to <a
+# | href=\"http{+s+}://www.zdnet.com/article/stallman-love-is-not-free/\">drop
+# | the goal of freedom and work instead for the &ldquo;popularity of
+# | Linux&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "People try to justify adding nonfree software in the name of the &ldquo;"
+#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
+#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
+#| "Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;"
+#| "feels that the move toward open source software should be fueled by "
+#| "technical, rather than political, decisions.&rdquo; And Caldera's <abbr "
+#| "title=\"Chief Executive Officer\">CEO</abbr> openly urged users to <a "
+#| "href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
+#| "goal of freedom and work instead for the &ldquo;popularity of Linux&rdquo;"
+#| "</a>."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -175,7 +243,7 @@
 "said that Robert McMillan, editor of Linux Magazine, &ldquo;feels that the "
 "move toward open source software should be fueled by technical, rather than "
 "political, decisions.&rdquo; And Caldera's <abbr title=\"Chief Executive "
-"Officer\">CEO</abbr> openly urged users to <a href=\"http://www.zdnet.com/";
+"Officer\">CEO</abbr> openly urged users to <a href=\"https://www.zdnet.com/";
 "article/stallman-love-is-not-free/\">drop the goal of freedom and work "
 "instead for the &ldquo;popularity of Linux&rdquo;</a>."
 msgstr ""
@@ -188,7 +256,7 @@
 "com/article/stallman-love-is-not-free/\">upustili od cíle svobody a spíše "
 "pracovali na „popularitě Linuxu“</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -206,7 +274,7 @@
 "zapomněli na cíle svobody. Není vám k ničemu jet rychleji, pokud se "
 "neudržíte na silnici."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, it "
 "can become a trap for free software developers.  When they write free "
@@ -228,7 +296,7 @@
 "Javy od Sunu: <a href=\"/philosophy/java-trap.html\">Javovská past</a>, "
 "který je dnes naštěstí víceméně napravený."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -244,7 +312,7 @@
 "nebudeme moct používat bez nesvobodného softwaru, který budou spolu s 
ním "
 "uživatelé očekávat. Pokud se toto stane, naše kampaň za svobodu 
selhala."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -267,7 +335,7 @@
 "formáty, než <strong>zavržení nesvobodných programů, které je 
používají</"
 "strong>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -284,7 +352,7 @@
 "odhodlanost, jakou mají lidé, když bojují za svou svobodu a 
společenství, "
 "odhodlanost, která nevyprchá a bude trvat roky. "
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "In our community, this goal and this determination emanate mainly from the "
 "GNU Project.  We're the ones who talk about freedom and community as "
@@ -308,18 +376,38 @@
 "aby propagovali tyto aplikace. Hlavní místo, kde se lidé mohou setkat s "
 "myšlenkou svobody a odhodlání, je projekt GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid "But when people come across it, will they feel it relates to them?"
 msgstr "Když se s ním ale lidé setkají, uvědomí si, že se jich to 
týká?"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People who know they are using a system that came out of the GNU Project
+# | can see a direct relationship between themselves and GNU.  They won't
+# | automatically agree with our philosophy, but at least they will see a
+# | reason to think seriously about it.  In contrast, people who consider
+# | themselves &ldquo;Linux [-users&rdquo;,-] {+users,&rdquo;+} and believe
+# | that the GNU Project &ldquo;developed tools which proved to be useful in
+# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} typically perceive only an indirect
+# | relationship between GNU and themselves.  They may just ignore the GNU
+# | philosophy when they come across it.
+#, fuzzy
+#| msgid ""
+#| "People who know they are using a system that came out of the GNU Project "
+#| "can see a direct relationship between themselves and GNU.  They won't "
+#| "automatically agree with our philosophy, but at least they will see a "
+#| "reason to think seriously about it.  In contrast, people who consider "
+#| "themselves &ldquo;Linux users&rdquo;, and believe that the GNU Project "
+#| "&ldquo;developed tools which proved to be useful in Linux&rdquo;, "
+#| "typically perceive only an indirect relationship between GNU and "
+#| "themselves.  They may just ignore the GNU philosophy when they come "
+#| "across it."
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
 "automatically agree with our philosophy, but at least they will see a reason "
 "to think seriously about it.  In contrast, people who consider themselves "
-"&ldquo;Linux users&rdquo;, and believe that the GNU Project &ldquo;developed "
-"tools which proved to be useful in Linux&rdquo;, typically perceive only an "
+"&ldquo;Linux users,&rdquo; and believe that the GNU Project &ldquo;developed "
+"tools which proved to be useful in Linux,&rdquo; typically perceive only an "
 "indirect relationship between GNU and themselves.  They may just ignore the "
 "GNU philosophy when they come across it."
 msgstr ""
@@ -331,11 +419,26 @@
 "spojení mezi sebou a projektem GNU pouze jako nepřímé. Mohou filosofii 
GNU "
 "prostě ignorovat, když se s ní setkají."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project is idealistic, and anyone encouraging idealism today faces
+# | a great obstacle: the prevailing ideology encourages people to dismiss
+# | idealism as [-&ldquo;impractical&rdquo;.-] {+&ldquo;impractical.&rdquo;+}
+# | Our idealism has been extremely practical: it is the reason we have a free
+# | <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> operating system. 
+# | People who love this system ought to know that it is our idealism made
+# | real.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project is idealistic, and anyone encouraging idealism today "
+#| "faces a great obstacle: the prevailing ideology encourages people to "
+#| "dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been "
+#| "extremely practical: it is the reason we have a free <a href=\"/gnu/linux-"
+#| "and-gnu.html\">GNU/Linux</a> operating system.  People who love this "
+#| "system ought to know that it is our idealism made real."
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
-"idealism as &ldquo;impractical&rdquo;.  Our idealism has been extremely "
+"idealism as &ldquo;impractical.&rdquo; Our idealism has been extremely "
 "practical: it is the reason we have a free <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> operating system.  People who love this system ought to "
 "know that it is our idealism made real."
@@ -347,7 +450,7 @@
 "gnu/linux-and-gnu.html\">GNU/Linux</a>. Lidé, kteří mají tento systém 
rádi, "
 "by měli vědět, že to je náš idealismus, který ho stvořil."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If &ldquo;the job&rdquo; really were done, if there were nothing at stake "
 "except credit, perhaps it would be wiser to let the matter drop.  But we are "
@@ -363,6 +466,25 @@
 "pomozte nám v tom tím, že budete systém nazývat <a 
href=\"/gnu/linux-and-gnu."
 "html\">GNU/Linux</a>."
 
+#. type: Content of: <div><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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Tato esej vyšla v knize <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>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -407,8 +529,12 @@
 "se dozvíte, jak koordinovat svoji práci a posílat překlady tohoto 
článku."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+# | Copyright &copy; 2000, [-2006,-] 2007, [-2014-2016, 2020,-] 2021 Richard
+# | Stallman
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
 
@@ -431,3 +557,12 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Aktualizováno:"
+
+#~ 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>."
+#~ msgstr ""
+#~ "Tato esej vyšla v knize <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>."

Index: gnu/po/why-gnu-linux.de.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.de.po,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- gnu/po/why-gnu-linux.de.po  31 May 2021 13:39:47 -0000      1.53
+++ gnu/po/why-gnu-linux.de.po  30 Aug 2021 13:34:54 -0000      1.54
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: why-gnu-linux.html\n"
 "Report-Msgid-Bugs-To: Webmasters <webmasters@gnu.org>\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2016-03-23 22:00+0100\n"
 "Last-Translator: Jоегg Kоhпе <joeko (AT) online [PUNKT] de>\n"
 "Language-Team: www-de <www-de-translators@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-08-30 13:26+0000\n"
 
 # see h2
 #. type: Content of: <title>
@@ -25,48 +26,41 @@
 "GNU/Linux. Ist der Name Schall und Rauch? - GNU-Projekt - Free Software "
 "Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "What's in a Name?"
 msgstr "GNU/Linux. Ist der Name Schall und Rauch?"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "von <a href=\"//www.stallman.org/\">Richard Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
-"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>, which gives a history of the GNU/Linux "
-"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Weitere Informationen zu diesem Thema finden Sie unter <cite><a href=\"/gnu/"
-"gnu-linux-faq\">GNU/Linux: Häufig gestellte Fragen</a></cite>, <cite><a 
href="
-"\"/gnu/linux-and-gnu\">Das GNU-System und Linux</a></cite>, eine Historie "
-"des GNU/Linux-Systems und wie es zur Benennung kam, sowie <cite><a href=\"/"
-"gnu/gnu-users-never-heard-of-gnu\">GNU-Nutzer, die noch nie von GNU gehört "
-"haben</a></cite>."
-
 #. type: Content of: <div><p>
-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>."
-msgstr ""
-"Der englischsprachige Aufsatz wurde in <cite><a href=\"//shop.fsf.org/"
-"product/free-software-free-society/\" xml:lang=\"en\" lang=\"en\">Free "
-"Software, Free Society: The Selected Essays of Richard M. Stallman</a></"
-"cite> veröffentlicht."
-
-#. type: Content of: <div><div><p>
+# | Names convey meanings; our choice of names determines the meaning of what
+# | we say.  An inappropriate name gives people the wrong idea.  A rose by any
+# | other name would smell as sweet&mdash;but if you call it a pen, people
+# | will be rather disappointed when they try to write with it.  And if you
+# | call pens [-&ldquo;roses&rdquo;,-] {+&ldquo;roses,&rdquo;+} people may not
+# | realize what they are good for.  If you call our operating system Linux,
+# | that conveys a mistaken idea of the system's origin, history, and purpose.
+# |  If you call it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that
+# | conveys (though not in detail) an accurate idea.
+#, fuzzy
+#| msgid ""
+#| "Names convey meanings; our choice of names determines the meaning of what "
+#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
+#| "any other name would smell as sweet&mdash;but if you call it a pen, "
+#| "people will be rather disappointed when they try to write with it.  And "
+#| "if you call pens &ldquo;roses&rdquo;, people may not realize what they "
+#| "are good for.  If you call our operating system Linux, that conveys a "
+#| "mistaken idea of the system's origin, history, and purpose.  If you call "
+#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
+#| "(though not in detail) an accurate idea."
 msgid ""
 "Names convey meanings; our choice of names determines the meaning of what we "
 "say.  An inappropriate name gives people the wrong idea.  A rose by any "
 "other name would smell as sweet&mdash;but if you call it a pen, people will "
 "be rather disappointed when they try to write with it.  And if you call pens "
-"&ldquo;roses&rdquo;, people may not realize what they are good for.  If you "
+"&ldquo;roses,&rdquo; people may not realize what they are good for.  If you "
 "call our operating system Linux, that conveys a mistaken idea of the "
 "system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
 "and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
@@ -84,6 +78,37 @@
 "nennt, vermittelt das (wenn auch nicht im Detail) eine genauere Vorstellung."
 
 #. type: Content of: <div><div><p>
+# | To learn more about this issue, you can read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
+# | {+System</a>,+} which gives a history of the GNU/Linux system as it
+# | relates to this issue of naming, and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+#| "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu."
+#| "html\">Linux and the GNU Project</a>, which gives a history of the GNU/"
+#| "Linux system as it relates to this issue of naming, and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>, which gives a history of the GNU/Linux "
+"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Weitere Informationen zu diesem Thema finden Sie unter <cite><a href=\"/gnu/"
+"gnu-linux-faq\">GNU/Linux: Häufig gestellte Fragen</a></cite>, <cite><a 
href="
+"\"/gnu/linux-and-gnu\">Das GNU-System und Linux</a></cite>, eine Historie "
+"des GNU/Linux-Systems und wie es zur Benennung kam, sowie <cite><a href=\"/"
+"gnu/gnu-users-never-heard-of-gnu\">GNU-Nutzer, die noch nie von GNU gehört "
+"haben</a></cite>."
+
+#. type: Content of: <div><p>
 msgid ""
 "Does this really matter for our community? Is it important whether people "
 "know the system's origin, history, and purpose? Yes&mdash;because people who "
@@ -100,7 +125,7 @@
 "Entwicklung von GNU veranlasst haben, sind nicht völlig ausgerottet und "
 "drohen sich zu wiederholen."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
@@ -108,7 +133,7 @@
 "Wenn ich erkläre, warum es angebracht ist das Betriebssystem eher <em>GNU/"
 "Linux</em> als <em>„Linux“</em> zu nennen, wird manchmal so reagiert:"
 
-#. type: Content of: <div><div><blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "<em> Granted that the GNU Project deserves credit for this work, is it "
 "really worth a fuss when people don't give credit? Isn't the important thing "
@@ -121,7 +146,7 @@
 "nicht wer? Sie sollten sich entspannen, stolz auf die geleistete Arbeit sein "
 "und sich um Anerkennung keine Sorgen machen.</q></cite>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "This would be wise advice, if only the situation were like that&mdash;if the "
 "job were done and it were time to relax.  If only that were true! But "
@@ -139,7 +164,7 @@
 "linux-and-gnu\">GNU/Linux</a></em> zu benutzen ist eine Möglichkeit sich "
 "daran zu erinnern und andere über die Ziele zu informieren."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "It is possible to write good free software without thinking of GNU; much "
 "good work has been done in the name of Linux also.  But the term &ldquo;"
@@ -155,7 +180,27 @@
 "zunehmend von Unternehmen verwendet wird, werden wir sogar noch mehr "
 "Schwierigkeiten haben, ihn mit Gemeinschaftsgeist in Verbindung zu bringen."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | A great challenge to the future of free software comes from the tendency
+# | of the &ldquo;Linux&rdquo; distribution companies to add nonfree software
+# | to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of
+# | convenience and power.  All the major commercial distribution developers
+# | do this; none limits itself to free software.  Most of them do not clearly
+# | identify the nonfree packages in their distributions.  Many even develop
+# | nonfree software and add it to the system.  Some outrageously advertise
+# | &ldquo;Linux&rdquo; systems that are &ldquo;licensed per [-seat&rdquo;,-]
+# | {+seat,&rdquo;+} which give the user as much freedom as Microsoft Windows.
+#, fuzzy
+#| msgid ""
+#| "A great challenge to the future of free software comes from the tendency "
+#| "of the &ldquo;Linux&rdquo; distribution companies to add nonfree software "
+#| "to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of "
+#| "convenience and power.  All the major commercial distribution developers "
+#| "do this; none limits itself to free software.  Most of them do not "
+#| "clearly identify the nonfree packages in their distributions.  Many even "
+#| "develop nonfree software and add it to the system.  Some outrageously "
+#| "advertise &ldquo;Linux&rdquo; systems that are &ldquo;licensed per "
+#| "seat&rdquo;, which give the user as much freedom as Microsoft Windows."
 msgid ""
 "A great challenge to the future of free software comes from the tendency of "
 "the &ldquo;Linux&rdquo; distribution companies to add nonfree software to <a "
@@ -164,7 +209,7 @@
 "limits itself to free software.  Most of them do not clearly identify the "
 "nonfree packages in their distributions.  Many even develop nonfree software "
 "and add it to the system.  Some outrageously advertise &ldquo;Linux&rdquo; "
-"systems that are &ldquo;licensed per seat&rdquo;, which give the user as "
+"systems that are &ldquo;licensed per seat,&rdquo; which give the user as "
 "much freedom as Microsoft Windows."
 msgstr ""
 "Eine große Herausforderung für die Zukunft freier Software kommt 
tendenziell "
@@ -177,7 +222,29 @@
 "„Linux“-Systeme, die <em>pro Einzelplatz lizenziert</em> werden, die dem "
 "Nutzer ebenso viel Freiheit wie Microsoft Windows geben."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People try to justify adding nonfree software in the name of the
+# | &ldquo;popularity of Linux&rdquo;&mdash;in effect, valuing popularity
+# | above freedom.  Sometimes this is openly admitted.  For instance, Wired
+# | Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;feels
+# | that the move toward open source software should be fueled by technical,
+# | rather than political, decisions.&rdquo; And Caldera's <abbr title=\"Chief
+# | Executive Officer\">CEO</abbr> openly urged users to <a
+# | href=\"http{+s+}://www.zdnet.com/article/stallman-love-is-not-free/\">drop
+# | the goal of freedom and work instead for the &ldquo;popularity of
+# | Linux&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "People try to justify adding nonfree software in the name of the &ldquo;"
+#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
+#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
+#| "Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;"
+#| "feels that the move toward open source software should be fueled by "
+#| "technical, rather than political, decisions.&rdquo; And Caldera's <abbr "
+#| "title=\"Chief Executive Officer\">CEO</abbr> openly urged users to <a "
+#| "href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
+#| "goal of freedom and work instead for the &ldquo;popularity of Linux&rdquo;"
+#| "</a>."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -185,7 +252,7 @@
 "said that Robert McMillan, editor of Linux Magazine, &ldquo;feels that the "
 "move toward open source software should be fueled by technical, rather than "
 "political, decisions.&rdquo; And Caldera's <abbr title=\"Chief Executive "
-"Officer\">CEO</abbr> openly urged users to <a href=\"http://www.zdnet.com/";
+"Officer\">CEO</abbr> openly urged users to <a href=\"https://www.zdnet.com/";
 "article/stallman-love-is-not-free/\">drop the goal of freedom and work "
 "instead for the &ldquo;popularity of Linux&rdquo;</a>."
 msgstr ""
@@ -201,7 +268,7 @@
 "und sich stattdessen für die „Beliebtheit von Linux“ 
einzusetzen</a></em>."
 
 # (to forget <coll.>) -> aus den Augen zu verlieren
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -220,7 +287,7 @@
 "akzeptieren und das Ziel, Freiheit, aus den Augen zu verlieren. Es ist nicht "
 "gut schneller zu fahren, wenn man nicht auf der Straße bleiben kann."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, it "
 "can become a trap for free software developers.  When they write free "
@@ -243,7 +310,7 @@
 "glücklicherweise nun größtenteils korrigierte <cite><a href=\"/philosophy/"
 "java-trap\">Java-Falle</a></cite>. "
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -260,7 +327,7 @@
 "Nutzer mit ihr vorzufinden erwarten. Wenn dies geschieht, wird unser Kampf "
 "für Freiheit fehlgeschlagen sein."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -285,7 +352,7 @@
 "patentierten und geheimen Dateiformate zu bekämpfen, außer <strong>die "
 "unfreien Programme zurückzuweisen, die diese nutzen</strong>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -305,7 +372,7 @@
 "kämpfen&nbsp;&ndash;&nbsp;Entschlossenheit für Jahre fortzufahren und nicht 
"
 "aufzugeben."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "In our community, this goal and this determination emanate mainly from the "
 "GNU Project.  We're the ones who talk about freedom and community as "
@@ -331,20 +398,40 @@
 "Der wichtigste Ort in unserer Gemeinschaft, an dem man wahrscheinlich dem "
 "Gedanken von Freiheit und Entschlossenheit begegnet, ist das GNU-Projekt."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid "But when people come across it, will they feel it relates to them?"
 msgstr ""
 "Aber wenn man dem begegnet, wird man das Gefühl haben, dass es sich auf "
 "einen selbst bezieht?"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People who know they are using a system that came out of the GNU Project
+# | can see a direct relationship between themselves and GNU.  They won't
+# | automatically agree with our philosophy, but at least they will see a
+# | reason to think seriously about it.  In contrast, people who consider
+# | themselves &ldquo;Linux [-users&rdquo;,-] {+users,&rdquo;+} and believe
+# | that the GNU Project &ldquo;developed tools which proved to be useful in
+# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} typically perceive only an indirect
+# | relationship between GNU and themselves.  They may just ignore the GNU
+# | philosophy when they come across it.
+#, fuzzy
+#| msgid ""
+#| "People who know they are using a system that came out of the GNU Project "
+#| "can see a direct relationship between themselves and GNU.  They won't "
+#| "automatically agree with our philosophy, but at least they will see a "
+#| "reason to think seriously about it.  In contrast, people who consider "
+#| "themselves &ldquo;Linux users&rdquo;, and believe that the GNU Project "
+#| "&ldquo;developed tools which proved to be useful in Linux&rdquo;, "
+#| "typically perceive only an indirect relationship between GNU and "
+#| "themselves.  They may just ignore the GNU philosophy when they come "
+#| "across it."
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
 "automatically agree with our philosophy, but at least they will see a reason "
 "to think seriously about it.  In contrast, people who consider themselves "
-"&ldquo;Linux users&rdquo;, and believe that the GNU Project &ldquo;developed "
-"tools which proved to be useful in Linux&rdquo;, typically perceive only an "
+"&ldquo;Linux users,&rdquo; and believe that the GNU Project &ldquo;developed "
+"tools which proved to be useful in Linux,&rdquo; typically perceive only an "
 "indirect relationship between GNU and themselves.  They may just ignore the "
 "GNU philosophy when they come across it."
 msgstr ""
@@ -358,11 +445,26 @@
 "indirekte Beziehung zwischen GNU und sich selbst. Sie können die GNU-"
 "Philosophie einfach ignorieren, wenn sie ihr begegnen."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project is idealistic, and anyone encouraging idealism today faces
+# | a great obstacle: the prevailing ideology encourages people to dismiss
+# | idealism as [-&ldquo;impractical&rdquo;.-] {+&ldquo;impractical.&rdquo;+}
+# | Our idealism has been extremely practical: it is the reason we have a free
+# | <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> operating system. 
+# | People who love this system ought to know that it is our idealism made
+# | real.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project is idealistic, and anyone encouraging idealism today "
+#| "faces a great obstacle: the prevailing ideology encourages people to "
+#| "dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been "
+#| "extremely practical: it is the reason we have a free <a href=\"/gnu/linux-"
+#| "and-gnu.html\">GNU/Linux</a> operating system.  People who love this "
+#| "system ought to know that it is our idealism made real."
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
-"idealism as &ldquo;impractical&rdquo;.  Our idealism has been extremely "
+"idealism as &ldquo;impractical.&rdquo; Our idealism has been extremely "
 "practical: it is the reason we have a free <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> operating system.  People who love this system ought to "
 "know that it is our idealism made real."
@@ -375,7 +477,7 @@
 "Menschen, die dieses System lieben, sollten wissen, dass es unser wahr "
 "gemachter Idealismus ist."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If &ldquo;the job&rdquo; really were done, if there were nothing at stake "
 "except credit, perhaps it would be wiser to let the matter drop.  But we are "
@@ -391,6 +493,26 @@
 "was wir bereits geleistet haben. Bitte helfen Sie uns, indem Sie das "
 "Betriebssystem <b><a href=\"/gnu/linux-and-gnu\">GNU/Linux</a></b> nennen."
 
+#. type: Content of: <div><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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Dieser Aufsatz wurde englischsprachig in <cite><a href=\"//shop.fsf.org/"
+"product/free-software-free-society/\" xml:lang=\"en\" lang=\"en\">Free "
+"Software, Free Society: The Selected Essays of Richard M. Stallman</a></"
+"cite> veröffentlicht."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -451,10 +573,11 @@
 "standards/README.translations\">LIESMICH für Übersetzungen</a>."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
-msgstr ""
-"Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman."
+# | Copyright &copy; 2000, [-2006, 2007-] {+2007, 2021+} Richard Stallman
+#, fuzzy
+#| msgid "Copyright &copy; 2000, 2006, 2007 Richard Stallman"
+msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
+msgstr "Copyright &copy; 2000, 2006, 2007 Richard Stallman."
 
 #. type: Content of: <div><p>
 msgid ""
@@ -479,6 +602,21 @@
 msgstr "Letzte Änderung:"
 
 #~ 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>."
+#~ msgstr ""
+#~ "Der englischsprachige Aufsatz wurde in <cite><a href=\"//shop.fsf.org/"
+#~ "product/free-software-free-society/\" xml:lang=\"en\" lang=\"en\">Free "
+#~ "Software, Free Society: The Selected Essays of Richard M. Stallman</a></"
+#~ "cite> veröffentlicht."
+
+#~ msgid ""
+#~ "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+#~ msgstr ""
+#~ "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman."
+
+#~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"
 #~ msgstr ""
@@ -571,9 +709,6 @@
 #~ "web/20000920053929/http://www.zdnet.com/filters/";
 #~ "printerfriendly/0,6061,2552025-2,00.html</a>)."
 
-#~ msgid "Copyright &copy; 2000, 2006, 2007 Richard Stallman"
-#~ msgstr "Copyright &copy; 2000, 2006, 2007 Richard Stallman."
-
 #~ msgid ""
 #~ "People try to justify adding nonfree software in the name of the &ldquo;"
 #~ "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "

Index: gnu/po/why-gnu-linux.el.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.el.po,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- gnu/po/why-gnu-linux.el.po  7 Jun 2021 08:29:32 -0000       1.43
+++ gnu/po/why-gnu-linux.el.po  30 Aug 2021 13:34:54 -0000      1.44
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: www-el_v0.2.0\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2015-04-12 17:23+0200\n"
 "Last-Translator: Georgios Zarkadas <gz@member.fsf.org>\n"
 "Language-Team: Greek <www-el-translators@gnu.org>\n"
@@ -18,6 +18,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Poedit 1.6.10\n"
 
@@ -25,48 +26,41 @@
 msgid "Why GNU/Linux? - GNU Project - Free Software Foundation"
 msgstr "Γιατί GNU/Linux; - Έργο GNU - Ίδρυμα Ελεύθερου 
Λογισμικού"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "What's in a Name?"
 msgstr "Τι περιέχεται σ' ένα όνομα;"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "από τον <a href=\"https://www.stallman.org/\";>Richard 
Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
-"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>, which gives a history of the GNU/Linux "
-"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Για να μάθετε περισσότερα σχετικά μ' αυτό 
το θέμα, μπορείτε να διαβάσετε "
-"επίσης τις <a href=\"/gnu/gnu-linux-faq.html\">Συχνές 
ερωτήσεις GNU/Linux</"
-"a>, τη σελίδα μας σχετικά με <a 
href=\"/gnu/linux-and-gnu.html\">το Linux "
-"και το Έργο GNU</a>, η οποία δίνει την ιστορία 
του συστήματος GNU/Linux όπως "
-"σχετίζεται με το ζήτημα της ονομασίας, και 
τη σελίδα μας <a href=\"/gnu/gnu-"
-"users-never-heard-of-gnu.html\">Χρήστες του GNU που δεν 
άκουσαν ποτέ για το "
-"GNU</a>."
-
 #. type: Content of: <div><p>
-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>."
-msgstr ""
-"Το δοκίμιο αυτό είναι δημοσιευμένο στο <a 
href=\"http://shop.fsf.org/product/";
-"free-software-free-society/\"> <cite>Ελεύθερο Λογισμικό, 
Ελεύθερη Κοινωνία: "
-"Τα επίλεκτα δοκίμια του Richard M. Stallman</cite></a>."
-
-#. type: Content of: <div><div><p>
+# | Names convey meanings; our choice of names determines the meaning of what
+# | we say.  An inappropriate name gives people the wrong idea.  A rose by any
+# | other name would smell as sweet&mdash;but if you call it a pen, people
+# | will be rather disappointed when they try to write with it.  And if you
+# | call pens [-&ldquo;roses&rdquo;,-] {+&ldquo;roses,&rdquo;+} people may not
+# | realize what they are good for.  If you call our operating system Linux,
+# | that conveys a mistaken idea of the system's origin, history, and purpose.
+# |  If you call it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that
+# | conveys (though not in detail) an accurate idea.
+#, fuzzy
+#| msgid ""
+#| "Names convey meanings; our choice of names determines the meaning of what "
+#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
+#| "any other name would smell as sweet&mdash;but if you call it a pen, "
+#| "people will be rather disappointed when they try to write with it.  And "
+#| "if you call pens &ldquo;roses&rdquo;, people may not realize what they "
+#| "are good for.  If you call our operating system Linux, that conveys a "
+#| "mistaken idea of the system's origin, history, and purpose.  If you call "
+#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
+#| "(though not in detail) an accurate idea."
 msgid ""
 "Names convey meanings; our choice of names determines the meaning of what we "
 "say.  An inappropriate name gives people the wrong idea.  A rose by any "
 "other name would smell as sweet&mdash;but if you call it a pen, people will "
 "be rather disappointed when they try to write with it.  And if you call pens "
-"&ldquo;roses&rdquo;, people may not realize what they are good for.  If you "
+"&ldquo;roses,&rdquo; people may not realize what they are good for.  If you "
 "call our operating system Linux, that conveys a mistaken idea of the "
 "system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
 "and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
@@ -84,6 +78,38 @@
 "Linux</a>, αυτό αποδίδει (αν και όχι 
λεπτομερώς) μια σωστή ιδέα."
 
 #. type: Content of: <div><div><p>
+# | To learn more about this issue, you can read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
+# | {+System</a>,+} which gives a history of the GNU/Linux system as it
+# | relates to this issue of naming, and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+#| "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu."
+#| "html\">Linux and the GNU Project</a>, which gives a history of the GNU/"
+#| "Linux system as it relates to this issue of naming, and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>, which gives a history of the GNU/Linux "
+"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Για να μάθετε περισσότερα σχετικά μ' αυτό 
το θέμα, μπορείτε να διαβάσετε "
+"επίσης τις <a href=\"/gnu/gnu-linux-faq.html\">Συχνές 
ερωτήσεις GNU/Linux</"
+"a>, τη σελίδα μας σχετικά με <a 
href=\"/gnu/linux-and-gnu.html\">το Linux "
+"και το Έργο GNU</a>, η οποία δίνει την ιστορία 
του συστήματος GNU/Linux όπως "
+"σχετίζεται με το ζήτημα της ονομασίας, και 
τη σελίδα μας <a href=\"/gnu/gnu-"
+"users-never-heard-of-gnu.html\">Χρήστες του GNU που δεν 
άκουσαν ποτέ για το "
+"GNU</a>."
+
+#. type: Content of: <div><p>
 msgid ""
 "Does this really matter for our community? Is it important whether people "
 "know the system's origin, history, and purpose? Yes&mdash;because people who "
@@ -100,7 +126,7 @@
 "εγγυημένο ότι θα επιβιώσει· τα προβλήματα 
που μας οδήγησαν να αναπτύξουμε το "
 "GNU δεν εξαλείφθηκαν εντελώς και απειλούν 
να επιστρέψουν."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
@@ -108,7 +134,7 @@
 "Όταν εξηγώ γιατί είναι κατάλληλο ν' 
αποκαλείτε το λειτουργικό σύστημα GNU/"
 "Linux αντί για Linux, οι άνθρωποι απαντούν 
μερικές φορές μ' αυτόν τον τρόπο:"
 
-#. type: Content of: <div><div><blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "<em> Granted that the GNU Project deserves credit for this work, is it "
 "really worth a fuss when people don't give credit? Isn't the important thing "
@@ -122,7 +148,7 @@
 "την άξια συγχαρητηρίων εργασία και όχι να 
ανησυχείτε για την αναγνώριση της. "
 "</em>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "This would be wise advice, if only the situation were like that&mdash;if the "
 "job were done and it were time to relax.  If only that were true! But "
@@ -140,7 +166,7 @@
 "ώστε οι άνθρωποι να θυμούνται και να 
ενημερώνουν τους άλλους για τους "
 "στόχους του έργου GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "It is possible to write good free software without thinking of GNU; much "
 "good work has been done in the name of Linux also.  But the term &ldquo;"
@@ -157,7 +183,27 @@
 "έχουμε ακόμη μεγαλύτερο πρόβλημα να το 
κάνουμε να συνδεθεί με το πνεύμα της "
 "κοινότητας."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | A great challenge to the future of free software comes from the tendency
+# | of the &ldquo;Linux&rdquo; distribution companies to add nonfree software
+# | to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of
+# | convenience and power.  All the major commercial distribution developers
+# | do this; none limits itself to free software.  Most of them do not clearly
+# | identify the nonfree packages in their distributions.  Many even develop
+# | nonfree software and add it to the system.  Some outrageously advertise
+# | &ldquo;Linux&rdquo; systems that are &ldquo;licensed per [-seat&rdquo;,-]
+# | {+seat,&rdquo;+} which give the user as much freedom as Microsoft Windows.
+#, fuzzy
+#| msgid ""
+#| "A great challenge to the future of free software comes from the tendency "
+#| "of the &ldquo;Linux&rdquo; distribution companies to add nonfree software "
+#| "to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of "
+#| "convenience and power.  All the major commercial distribution developers "
+#| "do this; none limits itself to free software.  Most of them do not "
+#| "clearly identify the nonfree packages in their distributions.  Many even "
+#| "develop nonfree software and add it to the system.  Some outrageously "
+#| "advertise &ldquo;Linux&rdquo; systems that are &ldquo;licensed per "
+#| "seat&rdquo;, which give the user as much freedom as Microsoft Windows."
 msgid ""
 "A great challenge to the future of free software comes from the tendency of "
 "the &ldquo;Linux&rdquo; distribution companies to add nonfree software to <a "
@@ -166,7 +212,7 @@
 "limits itself to free software.  Most of them do not clearly identify the "
 "nonfree packages in their distributions.  Many even develop nonfree software "
 "and add it to the system.  Some outrageously advertise &ldquo;Linux&rdquo; "
-"systems that are &ldquo;licensed per seat&rdquo;, which give the user as "
+"systems that are &ldquo;licensed per seat,&rdquo; which give the user as "
 "much freedom as Microsoft Windows."
 msgstr ""
 "Μια μεγάλη πρόκληση στο μέλλον του 
ελεύθερου λογισμικού προέρχεται από την "
@@ -181,7 +227,29 @@
 "διανέμονται &ldquo;με ξεχωριστή άδεια ανά 
θέση&rdquo;, τα οποία δίνουν στο "
 "χρήστη τόση ελευθερία όσο και τα Microsoft 
Windows."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People try to justify adding nonfree software in the name of the
+# | &ldquo;popularity of Linux&rdquo;&mdash;in effect, valuing popularity
+# | above freedom.  Sometimes this is openly admitted.  For instance, Wired
+# | Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;feels
+# | that the move toward open source software should be fueled by technical,
+# | rather than political, decisions.&rdquo; And Caldera's <abbr title=\"Chief
+# | Executive Officer\">CEO</abbr> openly urged users to <a
+# | href=\"http{+s+}://www.zdnet.com/article/stallman-love-is-not-free/\">drop
+# | the goal of freedom and work instead for the &ldquo;popularity of
+# | Linux&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "People try to justify adding nonfree software in the name of the &ldquo;"
+#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
+#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
+#| "Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;"
+#| "feels that the move toward open source software should be fueled by "
+#| "technical, rather than political, decisions.&rdquo; And Caldera's <abbr "
+#| "title=\"Chief Executive Officer\">CEO</abbr> openly urged users to <a "
+#| "href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
+#| "goal of freedom and work instead for the &ldquo;popularity of Linux&rdquo;"
+#| "</a>."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -189,7 +257,7 @@
 "said that Robert McMillan, editor of Linux Magazine, &ldquo;feels that the "
 "move toward open source software should be fueled by technical, rather than "
 "political, decisions.&rdquo; And Caldera's <abbr title=\"Chief Executive "
-"Officer\">CEO</abbr> openly urged users to <a href=\"http://www.zdnet.com/";
+"Officer\">CEO</abbr> openly urged users to <a href=\"https://www.zdnet.com/";
 "article/stallman-love-is-not-free/\">drop the goal of freedom and work "
 "instead for the &ldquo;popularity of Linux&rdquo;</a>."
 msgstr ""
@@ -205,7 +273,7 @@
 "\">απορρίψουν το στόχο της ελευθερίας και 
να εργαστούν αντίθετα για την "
 "αύξηση της &ldquo;δημοτικότητας του 
Linux&rdquo;</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -224,7 +292,7 @@
 "ελευθερίας.  Δεν είναι καλό να οδηγείς 
γρηγορότερα εάν δεν μπορείς να "
 "παραμείνεις στο δρόμο."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, it "
 "can become a trap for free software developers.  When they write free "
@@ -249,7 +317,7 @@
 "java-trap.html\">παγίδα της Java</a>, ευτυχώς τώρα 
κατά το μεγαλύτερο μέρος "
 "διορθωμένη."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -266,7 +334,7 @@
 "χωρίς το μη-ελεύθερο λογισμικό που οι 
χρήστες θα περιμένουν να βρουν μαζί "
 "του.  Εάν αυτό συμβεί, η εκστρατεία μας για 
την ελευθερία θα έχει αποτύχει."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -291,7 +359,7 @@
 "μυστικές μορφές δεδομένων εκτός από το ν' 
<strong>απορρίψουμε τα μη-ελεύθερα "
 "προγράμματα που τις χρησιμοποιούν</strong>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -310,7 +378,7 @@
 "άνθρωποι όταν μάχονται για την ελευθερία 
τους και την κοινότητά τους&mdash;"
 "αποφασιστικότητα να συνεχίσουν για 
χρόνια και να μην τα παρατήσουν."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "In our community, this goal and this determination emanate mainly from the "
 "GNU Project.  We're the ones who talk about freedom and community as "
@@ -337,19 +405,39 @@
 "στην κοινότητά μας όπου οι άνθρωποι είναι 
πιθανόν να έρθουν σ' επαφή με την "
 "ιδέα της ελευθερίας και της 
αποφασιστικότητας είναι το έργο GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid "But when people come across it, will they feel it relates to them?"
 msgstr ""
 "Αλλά όταν οι άνθρωποι το συναντήσουν αυτό, 
θα αισθανθούν ότι τους αφορά;"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People who know they are using a system that came out of the GNU Project
+# | can see a direct relationship between themselves and GNU.  They won't
+# | automatically agree with our philosophy, but at least they will see a
+# | reason to think seriously about it.  In contrast, people who consider
+# | themselves &ldquo;Linux [-users&rdquo;,-] {+users,&rdquo;+} and believe
+# | that the GNU Project &ldquo;developed tools which proved to be useful in
+# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} typically perceive only an indirect
+# | relationship between GNU and themselves.  They may just ignore the GNU
+# | philosophy when they come across it.
+#, fuzzy
+#| msgid ""
+#| "People who know they are using a system that came out of the GNU Project "
+#| "can see a direct relationship between themselves and GNU.  They won't "
+#| "automatically agree with our philosophy, but at least they will see a "
+#| "reason to think seriously about it.  In contrast, people who consider "
+#| "themselves &ldquo;Linux users&rdquo;, and believe that the GNU Project "
+#| "&ldquo;developed tools which proved to be useful in Linux&rdquo;, "
+#| "typically perceive only an indirect relationship between GNU and "
+#| "themselves.  They may just ignore the GNU philosophy when they come "
+#| "across it."
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
 "automatically agree with our philosophy, but at least they will see a reason "
 "to think seriously about it.  In contrast, people who consider themselves "
-"&ldquo;Linux users&rdquo;, and believe that the GNU Project &ldquo;developed "
-"tools which proved to be useful in Linux&rdquo;, typically perceive only an "
+"&ldquo;Linux users,&rdquo; and believe that the GNU Project &ldquo;developed "
+"tools which proved to be useful in Linux,&rdquo; typically perceive only an "
 "indirect relationship between GNU and themselves.  They may just ignore the "
 "GNU philosophy when they come across it."
 msgstr ""
@@ -363,11 +451,26 @@
 "και των ιδίων.  Μπορεί απλά ν' αγνοήσουν τη 
φιλοσοφία του GΝU όταν θα τη "
 "συναντήσουν."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project is idealistic, and anyone encouraging idealism today faces
+# | a great obstacle: the prevailing ideology encourages people to dismiss
+# | idealism as [-&ldquo;impractical&rdquo;.-] {+&ldquo;impractical.&rdquo;+}
+# | Our idealism has been extremely practical: it is the reason we have a free
+# | <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> operating system. 
+# | People who love this system ought to know that it is our idealism made
+# | real.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project is idealistic, and anyone encouraging idealism today "
+#| "faces a great obstacle: the prevailing ideology encourages people to "
+#| "dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been "
+#| "extremely practical: it is the reason we have a free <a href=\"/gnu/linux-"
+#| "and-gnu.html\">GNU/Linux</a> operating system.  People who love this "
+#| "system ought to know that it is our idealism made real."
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
-"idealism as &ldquo;impractical&rdquo;.  Our idealism has been extremely "
+"idealism as &ldquo;impractical.&rdquo; Our idealism has been extremely "
 "practical: it is the reason we have a free <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> operating system.  People who love this system ought to "
 "know that it is our idealism made real."
@@ -380,7 +483,7 @@
 "σύστημα.  Οι άνθρωποι που αγαπούν αυτό το 
σύστημα οφείλουν να γνωρίζουν ότι "
 "είναι ο ιδεαλισμός μας αυτός που το έκανε 
αληθινό."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If &ldquo;the job&rdquo; really were done, if there were nothing at stake "
 "except credit, perhaps it would be wiser to let the matter drop.  But we are "
@@ -397,6 +500,25 @@
 "βοηθήσετε, αποκαλώντας το λειτουργικό 
σύστημα <a href=\"/gnu/linux-and-gnu."
 "html\">GNU/Linux</a>."
 
+#. type: Content of: <div><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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Αυτό το δοκίμιο δημοσιεύεται στην <a 
href=\"http://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Ελεύθερο Λογισμικό, 
Ελεύθερη Κοινωνία: Tα "
+"Επιλεγμένα Δοκίμια του Richard M. Stallman</cite></a>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -442,8 +564,12 @@
 "\"/server/standards/README.translations.html\">Μεταφράσεις 
ΔΙΑΒΑΣΕΜΕ</a>."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+# | Copyright &copy; 2000, [-2006,-] 2007, [-2014-2016, 2020,-] 2021 Richard
+# | Stallman
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
 msgstr ""
 "Πνευματικά δικαιώματα:<br />\n"
 "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
@@ -473,3 +599,12 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Ενημερώθηκε:"
+
+#~ 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>."
+#~ msgstr ""
+#~ "Το δοκίμιο αυτό είναι δημοσιευμένο στο <a 
href=\"http://shop.fsf.org/";
+#~ "product/free-software-free-society/\"> <cite>Ελεύθερο 
Λογισμικό, Ελεύθερη "
+#~ "Κοινωνία: Τα επίλεκτα δοκίμια του Richard M. 
Stallman</cite></a>."

Index: gnu/po/why-gnu-linux.es.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.es.po,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- gnu/po/why-gnu-linux.es.po  30 Apr 2021 09:12:03 -0000      1.47
+++ gnu/po/why-gnu-linux.es.po  30 Aug 2021 13:34:54 -0000      1.48
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: why-gnu-linux.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-04-08 11:37+0200\n"
 "Last-Translator: Javier Fdez. Retenaga <jfrtnaga@gnu.org>\n"
 "Language-Team: Spanish <www-es-general@gnu.org>\n"
@@ -19,6 +19,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Poedit 2.2.1\n"
 
@@ -28,51 +29,43 @@
 msgstr "¿Por qué GNU/Linux? - Proyecto GNU - Free Software Foundation "
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "What's in a Name?"
 msgstr "¿Qué hay detrás de un nombre?"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "por <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-# type: Content of: <div><blockquote><p>
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
-"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>, which gives a history of the GNU/Linux "
-"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Para más información sobre este tema, consulte las  <a 
href=\"/gnu/gnu-linux-"
-"faq.html\">preguntas frecuentes acerca de GNU/Linux</a>, nuestra página "
-"sobre <a href=\"/gnu/linux-and-gnu.html\"> Linux y el Proyecto GNU</a> "
-"(donde se relata la historia del sistema GNU/Linux y su relación con esta "
-"cuestión de la nomenclatura) y la página sobre <a href=\"/gnu/gnu-users-"
-"never-heard-of-gnu.html\">usuarios de GNU que nunca han oído hablar de GNU</"
-"a>."
-
-#. type: Content of: <div><p>
-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>."
-msgstr ""
-"Este ensayo está publicado en el libro <a 
href=\"http://shop.fsf.org/product/";
-"free-software-free-society/\"> <cite>Software libre para una sociedad libre: "
-"Selección de ensayos de Richard M. Stallman</cite></a>."
-
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Names convey meanings; our choice of names determines the meaning of what
+# | we say.  An inappropriate name gives people the wrong idea.  A rose by any
+# | other name would smell as sweet&mdash;but if you call it a pen, people
+# | will be rather disappointed when they try to write with it.  And if you
+# | call pens [-&ldquo;roses&rdquo;,-] {+&ldquo;roses,&rdquo;+} people may not
+# | realize what they are good for.  If you call our operating system Linux,
+# | that conveys a mistaken idea of the system's origin, history, and purpose.
+# |  If you call it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that
+# | conveys (though not in detail) an accurate idea.
+#, fuzzy
+#| msgid ""
+#| "Names convey meanings; our choice of names determines the meaning of what "
+#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
+#| "any other name would smell as sweet&mdash;but if you call it a pen, "
+#| "people will be rather disappointed when they try to write with it.  And "
+#| "if you call pens &ldquo;roses&rdquo;, people may not realize what they "
+#| "are good for.  If you call our operating system Linux, that conveys a "
+#| "mistaken idea of the system's origin, history, and purpose.  If you call "
+#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
+#| "(though not in detail) an accurate idea."
 msgid ""
 "Names convey meanings; our choice of names determines the meaning of what we "
 "say.  An inappropriate name gives people the wrong idea.  A rose by any "
 "other name would smell as sweet&mdash;but if you call it a pen, people will "
 "be rather disappointed when they try to write with it.  And if you call pens "
-"&ldquo;roses&rdquo;, people may not realize what they are good for.  If you "
+"&ldquo;roses,&rdquo; people may not realize what they are good for.  If you "
 "call our operating system Linux, that conveys a mistaken idea of the "
 "system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
 "and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
@@ -89,8 +82,41 @@
 "gnu/linux-and-gnu.html\">GNU/Linux</a>, estará comunicando una idea más "
 "precisa (aunque no detallada)."
 
-# type: Content of: <p>
+# type: Content of: <div><blockquote><p>
 #. type: Content of: <div><div><p>
+# | To learn more about this issue, you can read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
+# | {+System</a>,+} which gives a history of the GNU/Linux system as it
+# | relates to this issue of naming, and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+#| "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu."
+#| "html\">Linux and the GNU Project</a>, which gives a history of the GNU/"
+#| "Linux system as it relates to this issue of naming, and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>, which gives a history of the GNU/Linux "
+"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Para más información sobre este tema, consulte las  <a 
href=\"/gnu/gnu-linux-"
+"faq.html\">preguntas frecuentes acerca de GNU/Linux</a>, nuestra página "
+"sobre <a href=\"/gnu/linux-and-gnu.html\"> Linux y el Proyecto GNU</a> "
+"(donde se relata la historia del sistema GNU/Linux y su relación con esta "
+"cuestión de la nomenclatura) y la página sobre <a href=\"/gnu/gnu-users-"
+"never-heard-of-gnu.html\">usuarios de GNU que nunca han oído hablar de GNU</"
+"a>."
+
+# type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Does this really matter for our community? Is it important whether people "
 "know the system's origin, history, and purpose? Yes&mdash;because people who "
@@ -108,7 +134,7 @@
 "regresar. "
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
@@ -117,7 +143,7 @@
 "y no Linux, la gente suele responder de esta manera:"
 
 # type: Content of: <blockquote><p>
-#. type: Content of: <div><div><blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "<em> Granted that the GNU Project deserves credit for this work, is it "
 "really worth a fuss when people don't give credit? Isn't the important thing "
@@ -131,7 +157,7 @@
 "preocupe por el reconocimiento.</em>"
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "This would be wise advice, if only the situation were like that&mdash;if the "
 "job were done and it were time to relax.  If only that were true! But "
@@ -149,7 +175,7 @@
 "los demás sobre estos objetivos."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "It is possible to write good free software without thinking of GNU; much "
 "good work has been done in the name of Linux also.  But the term &ldquo;"
@@ -166,7 +192,27 @@
 "espíritu de comunidad."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | A great challenge to the future of free software comes from the tendency
+# | of the &ldquo;Linux&rdquo; distribution companies to add nonfree software
+# | to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of
+# | convenience and power.  All the major commercial distribution developers
+# | do this; none limits itself to free software.  Most of them do not clearly
+# | identify the nonfree packages in their distributions.  Many even develop
+# | nonfree software and add it to the system.  Some outrageously advertise
+# | &ldquo;Linux&rdquo; systems that are &ldquo;licensed per [-seat&rdquo;,-]
+# | {+seat,&rdquo;+} which give the user as much freedom as Microsoft Windows.
+#, fuzzy
+#| msgid ""
+#| "A great challenge to the future of free software comes from the tendency "
+#| "of the &ldquo;Linux&rdquo; distribution companies to add nonfree software "
+#| "to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of "
+#| "convenience and power.  All the major commercial distribution developers "
+#| "do this; none limits itself to free software.  Most of them do not "
+#| "clearly identify the nonfree packages in their distributions.  Many even "
+#| "develop nonfree software and add it to the system.  Some outrageously "
+#| "advertise &ldquo;Linux&rdquo; systems that are &ldquo;licensed per "
+#| "seat&rdquo;, which give the user as much freedom as Microsoft Windows."
 msgid ""
 "A great challenge to the future of free software comes from the tendency of "
 "the &ldquo;Linux&rdquo; distribution companies to add nonfree software to <a "
@@ -175,7 +221,7 @@
 "limits itself to free software.  Most of them do not clearly identify the "
 "nonfree packages in their distributions.  Many even develop nonfree software "
 "and add it to the system.  Some outrageously advertise &ldquo;Linux&rdquo; "
-"systems that are &ldquo;licensed per seat&rdquo;, which give the user as "
+"systems that are &ldquo;licensed per seat,&rdquo; which give the user as "
 "much freedom as Microsoft Windows."
 msgstr ""
 "Un gran reto para el futuro del software libre proviene de la tendencia de "
@@ -192,7 +238,29 @@
 
 # type: Content of: <p>
 #
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People try to justify adding nonfree software in the name of the
+# | &ldquo;popularity of Linux&rdquo;&mdash;in effect, valuing popularity
+# | above freedom.  Sometimes this is openly admitted.  For instance, Wired
+# | Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;feels
+# | that the move toward open source software should be fueled by technical,
+# | rather than political, decisions.&rdquo; And Caldera's <abbr title=\"Chief
+# | Executive Officer\">CEO</abbr> openly urged users to <a
+# | href=\"http{+s+}://www.zdnet.com/article/stallman-love-is-not-free/\">drop
+# | the goal of freedom and work instead for the &ldquo;popularity of
+# | Linux&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "People try to justify adding nonfree software in the name of the &ldquo;"
+#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
+#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
+#| "Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;"
+#| "feels that the move toward open source software should be fueled by "
+#| "technical, rather than political, decisions.&rdquo; And Caldera's <abbr "
+#| "title=\"Chief Executive Officer\">CEO</abbr> openly urged users to <a "
+#| "href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
+#| "goal of freedom and work instead for the &ldquo;popularity of Linux&rdquo;"
+#| "</a>."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -200,7 +268,7 @@
 "said that Robert McMillan, editor of Linux Magazine, &ldquo;feels that the "
 "move toward open source software should be fueled by technical, rather than "
 "political, decisions.&rdquo; And Caldera's <abbr title=\"Chief Executive "
-"Officer\">CEO</abbr> openly urged users to <a href=\"http://www.zdnet.com/";
+"Officer\">CEO</abbr> openly urged users to <a href=\"https://www.zdnet.com/";
 "article/stallman-love-is-not-free/\">drop the goal of freedom and work "
 "instead for the &ldquo;popularity of Linux&rdquo;</a>."
 msgstr ""
@@ -216,7 +284,7 @@
 "trabajar en cambio por la «popularidad de Linux»</a>."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -236,7 +304,7 @@
 "uno se sale del camino. "
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, it "
 "can become a trap for free software developers.  When they write free "
@@ -261,7 +329,7 @@
 "mayor parte."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -279,7 +347,7 @@
 "nuestra campaña en defensa de la libertad habrá fracasado."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -304,7 +372,7 @@
 "los que se usan tales formatos</strong>."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -323,7 +391,7 @@
 "a continuar durante años sin darse por vencido."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "In our community, this goal and this determination emanate mainly from the "
 "GNU Project.  We're the ones who talk about freedom and community as "
@@ -351,19 +419,39 @@
 "GNU. "
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid "But when people come across it, will they feel it relates to them?"
 msgstr "Pero cuando lo escuchen, ¿se sentirán identificados con ello?"
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People who know they are using a system that came out of the GNU Project
+# | can see a direct relationship between themselves and GNU.  They won't
+# | automatically agree with our philosophy, but at least they will see a
+# | reason to think seriously about it.  In contrast, people who consider
+# | themselves &ldquo;Linux [-users&rdquo;,-] {+users,&rdquo;+} and believe
+# | that the GNU Project &ldquo;developed tools which proved to be useful in
+# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} typically perceive only an indirect
+# | relationship between GNU and themselves.  They may just ignore the GNU
+# | philosophy when they come across it.
+#, fuzzy
+#| msgid ""
+#| "People who know they are using a system that came out of the GNU Project "
+#| "can see a direct relationship between themselves and GNU.  They won't "
+#| "automatically agree with our philosophy, but at least they will see a "
+#| "reason to think seriously about it.  In contrast, people who consider "
+#| "themselves &ldquo;Linux users&rdquo;, and believe that the GNU Project "
+#| "&ldquo;developed tools which proved to be useful in Linux&rdquo;, "
+#| "typically perceive only an indirect relationship between GNU and "
+#| "themselves.  They may just ignore the GNU philosophy when they come "
+#| "across it."
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
 "automatically agree with our philosophy, but at least they will see a reason "
 "to think seriously about it.  In contrast, people who consider themselves "
-"&ldquo;Linux users&rdquo;, and believe that the GNU Project &ldquo;developed "
-"tools which proved to be useful in Linux&rdquo;, typically perceive only an "
+"&ldquo;Linux users,&rdquo; and believe that the GNU Project &ldquo;developed "
+"tools which proved to be useful in Linux,&rdquo; typically perceive only an "
 "indirect relationship between GNU and themselves.  They may just ignore the "
 "GNU philosophy when they come across it."
 msgstr ""
@@ -377,11 +465,26 @@
 "pasen por alto la filosofía de GNU cuando se encuentren con ella. "
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project is idealistic, and anyone encouraging idealism today faces
+# | a great obstacle: the prevailing ideology encourages people to dismiss
+# | idealism as [-&ldquo;impractical&rdquo;.-] {+&ldquo;impractical.&rdquo;+}
+# | Our idealism has been extremely practical: it is the reason we have a free
+# | <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> operating system. 
+# | People who love this system ought to know that it is our idealism made
+# | real.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project is idealistic, and anyone encouraging idealism today "
+#| "faces a great obstacle: the prevailing ideology encourages people to "
+#| "dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been "
+#| "extremely practical: it is the reason we have a free <a href=\"/gnu/linux-"
+#| "and-gnu.html\">GNU/Linux</a> operating system.  People who love this "
+#| "system ought to know that it is our idealism made real."
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
-"idealism as &ldquo;impractical&rdquo;.  Our idealism has been extremely "
+"idealism as &ldquo;impractical.&rdquo; Our idealism has been extremely "
 "practical: it is the reason we have a free <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> operating system.  People who love this system ought to "
 "know that it is our idealism made real."
@@ -395,7 +498,7 @@
 "hecho realidad."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If &ldquo;the job&rdquo; really were done, if there were nothing at stake "
 "except credit, perhaps it would be wiser to let the matter drop.  But we are "
@@ -411,6 +514,22 @@
 "hemos hecho. Le pedimos entonces que colabore con nosotros llamando al "
 "sistema operativo <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>."
 
+#. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "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>."
+msgid ""
+"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 ""
+"Este ensayo está publicado en el libro <a href=\"https://shop.fsf.org/";
+"product/free-software-free-society/\"><cite>Software libre para una sociedad "
+"libre: Selección de ensayos de Richard M. Stallman</cite></a>."
+
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -458,8 +577,12 @@
 "coordinación y el envío de traducciones de las páginas de este sitio web."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+# | Copyright &copy; 2000, [-2006,-] 2007, [-2014-2016, 2020,-] 2021 Richard
+# | Stallman
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
 
@@ -484,3 +607,12 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Última actualización:"
+
+#~ 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>."
+#~ msgstr ""
+#~ "Este ensayo está publicado en el libro <a href=\"http://shop.fsf.org/";
+#~ "product/free-software-free-society/\"> <cite>Software libre para una "
+#~ "sociedad libre: Selección de ensayos de Richard M. Stallman</cite></a>."

Index: gnu/po/why-gnu-linux.fa.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.fa.po,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- gnu/po/why-gnu-linux.fa.po  7 Apr 2021 18:04:11 -0000       1.31
+++ gnu/po/why-gnu-linux.fa.po  30 Aug 2021 13:34:54 -0000      1.32
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: why-gnu-linux.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2009-05-21 18:19+0330\n"
 "Last-Translator: Abbas Esmaeeli Some'eh <abbas@gnu.org>\n"
 "Language-Team: Persian <www-fa-general@list.gnu.org>\n"
@@ -23,17 +23,49 @@
 msgid "Why GNU/Linux? - GNU Project - Free Software Foundation"
 msgstr "چرا گنو/لینوکس؟ - پروژه گنو - بنیاد نرم
‌افزارهای آزاد"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "What's in a Name?"
 msgstr "چه چیزی درون یک نام نهفته است؟"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 #, fuzzy
 #| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "نوشتهٔ <a href=\"http://www.stallman.org/\";>ریچارد 
استالمن</a>"
 
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Names convey meanings; our choice of names determines the meaning of what "
+#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
+#| "any other name would smell as sweet&mdash;but if you call it a pen, "
+#| "people will be rather disappointed when they try to write with it.  And "
+#| "if you call pens &ldquo;roses&rdquo;, people may not realize what they "
+#| "are good for.  If you call our operating system Linux, that conveys a "
+#| "mistaken idea of the system's origin, history, and purpose.  If you call "
+#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
+#| "(though not in detail) an accurate idea."
+msgid ""
+"Names convey meanings; our choice of names determines the meaning of what we "
+"say.  An inappropriate name gives people the wrong idea.  A rose by any "
+"other name would smell as sweet&mdash;but if you call it a pen, people will "
+"be rather disappointed when they try to write with it.  And if you call pens "
+"&ldquo;roses,&rdquo; people may not realize what they are good for.  If you "
+"call our operating system Linux, that conveys a mistaken idea of the "
+"system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
+"and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
+"accurate idea."
+msgstr ""
+"اسامی معانی را می‌رسانند؛ انتخاب اسامی م
عنیِ آنچه می‌خواهیم بیان کنیم را مشخص "
+"می‌کنند. نام‌های بی‌جا طرز فکری اشتباه 
را به مردم القا می‌کنند. یک گل رز هر نامی "
+"که داشته باشد بوی خوشی می‌دهد&mdash;اما اگر 
آن را خودکار بنامید، هنگامی که "
+"دیگران می‌خواهند با آن چیزی بنویسند ناام
ید خواهند شد. و اگر خودکار را &rdquo;"
+"رز&ldquo; بنامید، اشخاص متوجه نخواهند شد که م
ناسب چه کاری است. اگر سیستم‌عاملِ "
+"ما را &rdquo;لینوکس&ldquo; بنامید، خاستگاه، 
تاریخچه و هدفی اشتباه را خواهد "
+"رساند. اگر آن را <a 
href=\"/gnu/linux-and-gnu.html\">گنو/لینوکس</a> بنامید، "
+"اندیشه‌ای صحیح (هر چند نه با جزئیات کامل) 
را خواهد رساند."
+
 # | To learn more about this issue, you can read our <a
 # | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
 # | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>-]
@@ -51,7 +83,7 @@
 msgid ""
 "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
 "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>, which gives a history of the GNU/Linux "
+"\">Linux and the GNU System</a>, which gives a history of the GNU/Linux "
 "system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
 "gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
 "a>."
@@ -61,37 +93,6 @@
 "\">لینوکس و پروژه گنو</a> و <a 
href=\"/gnu/gnu-users-never-heard-of-gnu.html"
 "\">کاربران گنو که چیزی درباره گنو 
نشنیده‌اند</a> را مطالعه کنید."
 
-#. type: Content of: <div><p>
-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>."
-msgstr ""
-"این مقاله در <a 
href=\"http://shop.fsf.org/product/free-software-free-";
-"society/\"><cite>نرم‌افزار آزاد، جامعهٔ آزاد: م
نتخب مقالات ریچارد استالمن</"
-"cite></a> منتشر شده است."
-
-#. type: Content of: <div><div><p>
-msgid ""
-"Names convey meanings; our choice of names determines the meaning of what we "
-"say.  An inappropriate name gives people the wrong idea.  A rose by any "
-"other name would smell as sweet&mdash;but if you call it a pen, people will "
-"be rather disappointed when they try to write with it.  And if you call pens "
-"&ldquo;roses&rdquo;, people may not realize what they are good for.  If you "
-"call our operating system Linux, that conveys a mistaken idea of the "
-"system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
-"and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
-"accurate idea."
-msgstr ""
-"اسامی معانی را می‌رسانند؛ انتخاب اسامی م
عنیِ آنچه می‌خواهیم بیان کنیم را مشخص "
-"می‌کنند. نام‌های بی‌جا طرز فکری اشتباه 
را به مردم القا می‌کنند. یک گل رز هر نامی "
-"که داشته باشد بوی خوشی می‌دهد&mdash;اما اگر 
آن را خودکار بنامید، هنگامی که "
-"دیگران می‌خواهند با آن چیزی بنویسند ناام
ید خواهند شد. و اگر خودکار را &rdquo;"
-"رز&ldquo; بنامید، اشخاص متوجه نخواهند شد که م
ناسب چه کاری است. اگر سیستم‌عاملِ "
-"ما را &rdquo;لینوکس&ldquo; بنامید، خاستگاه، 
تاریخچه و هدفی اشتباه را خواهد "
-"رساند. اگر آن را <a 
href=\"/gnu/linux-and-gnu.html\">گنو/لینوکس</a> بنامید، "
-"اندیشه‌ای صحیح (هر چند نه با جزئیات کامل) 
را خواهد رساند."
-
 # | [-But does-]{+Does+} this {+really+} matter for our community? Is it
 # | important whether people know the system's origin, history, and purpose?
 # | Yes&mdash;because people who forget history are often condemned to repeat
@@ -99,7 +100,7 @@
 # | href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> is not [-secure;-]
 # | {+guaranteed to survive;+} the problems that led us to develop GNU are not
 # | completely eradicated, and they threaten to come back.
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "But does this matter for our community? Is it important whether people "
@@ -123,7 +124,7 @@
 "شدند تا ما گنو را توسعه دهیم کاملا برطرف 
نشده‌اند، و تهدیدِ بازگشتشان وجود "
 "دارد."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
@@ -131,7 +132,7 @@
 "گاهی اوقات هنگامی که توضیح می‌دهم چرا 
بهتر است سیستم‌عامل به جای لینوکس، گنو/"
 "لینوکس; نامیده شود، افراد اینگونه پاسخ م
ی‌دهند:"
 
-#. type: Content of: <div><div><blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "<em> Granted that the GNU Project deserves credit for this work, is it "
 "really worth a fuss when people don't give credit? Isn't the important thing "
@@ -144,7 +145,7 @@
 "انجام داده است؟ آرام باش، به آنچه انجام 
شده افتخار کن، و نگران تمجید و ستایش "
 "نباش.</em>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "This would be wise advice, if only the situation were like that&mdash;if the "
 "job were done and it were time to relax.  If only that were true! But "
@@ -160,7 +161,7 @@
 "href=\"/gnu/linux-and-gnu.html\">گنو/لینوکس</a> روشی است 
برای اینکه افراد "
 "این اهداف را به خود یادآوری کرده و دیگران 
را دربارهٔ آنها مطلع کنند."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "It is possible to write good free software without thinking of GNU; much "
 "good work has been done in the name of Linux also.  But the term &ldquo;"
@@ -185,7 +186,7 @@
 # | software and add it to the system.  Some outrageously advertise
 # | &ldquo;Linux&rdquo; systems that are &ldquo;licensed per seat&rdquo;,
 # | which give the user as much freedom as Microsoft Windows.
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "A great challenge to the future of free software comes from the tendency "
@@ -206,7 +207,7 @@
 "limits itself to free software.  Most of them do not clearly identify the "
 "nonfree packages in their distributions.  Many even develop nonfree software "
 "and add it to the system.  Some outrageously advertise &ldquo;Linux&rdquo; "
-"systems that are &ldquo;licensed per seat&rdquo;, which give the user as "
+"systems that are &ldquo;licensed per seat,&rdquo; which give the user as "
 "much freedom as Microsoft Windows."
 msgstr ""
 "یکی از مبارزات بزرگ در آیندهٔ نرم‌افزار 
آزاد از آنجا آغاز شده است که شرکت‌های "
@@ -220,7 +221,19 @@
 "هر شخص&ldquo; تبلیغ می‌کنند، که به اندازهٔ 
ویندوز مایکروسافت به کاربران آزادی "
 "می‌دهد."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "People try to justify adding nonfree software in the name of the &ldquo;"
+#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
+#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
+#| "Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;"
+#| "feels that the move toward open source software should be fueled by "
+#| "technical, rather than political, decisions.&rdquo; And Caldera's <abbr "
+#| "title=\"Chief Executive Officer\">CEO</abbr> openly urged users to <a "
+#| "href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
+#| "goal of freedom and work instead for the &ldquo;popularity of Linux&rdquo;"
+#| "</a>."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -228,7 +241,7 @@
 "said that Robert McMillan, editor of Linux Magazine, &ldquo;feels that the "
 "move toward open source software should be fueled by technical, rather than "
 "political, decisions.&rdquo; And Caldera's <abbr title=\"Chief Executive "
-"Officer\">CEO</abbr> openly urged users to <a href=\"http://www.zdnet.com/";
+"Officer\">CEO</abbr> openly urged users to <a href=\"https://www.zdnet.com/";
 "article/stallman-love-is-not-free/\">drop the goal of freedom and work "
 "instead for the &ldquo;popularity of Linux&rdquo;</a>."
 msgstr ""
@@ -241,7 +254,7 @@
 "com/article/stallman-love-is-not-free/\">هدف آزادی را کنار 
گذاشته وبر روی "
 "&rdquo;محبوبیتِ لینوکس&ldquo; کار کنند</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -273,7 +286,7 @@
 # | href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>rereleasing
 # | its Java platform under GNU GPL</a>.)-] {+Trap</a>, fortunately now mostly
 # | corrected.+}
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, "
@@ -310,7 +323,7 @@
 "www.fsf.org/news/fsf-welcomes-gpl-java.html\">انتشار پلتفرم 
جاوا تحت قوانین "
 "GNU GPL</a> بود.)"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -326,7 +339,7 @@
 "انتظار دارد به همراهشان باشند، غیر قابل 
استفاده خواهند بود. اگر چنین اتفاقی "
 "بیافتد، مبارزهٔ ما برای نرم‌افزار آزاد 
شکست خواهد خورد."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -348,7 +361,7 @@
 "نخواهیم داشت، قالب‌هایی که <strong>نرم
‌افزارهای آزادی را که می‌خواهند از آنها "
 "استفاده کنند، نمی‌پذیرند</strong>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -377,7 +390,7 @@
 # | salesman to present those applications.  The main place people in our
 # | community are likely to come across the idea of freedom and determination
 # | is in the GNU Project.
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "In our community, this goal and this determination emanate mainly from "
@@ -415,20 +428,31 @@
 "تشویق می‌کنند. محلی که افراد جامعهٔ ما به 
اندیشهٔ آزادی و انگیزهٔ مبارزه برای آن "
 "می‌رسند، پروژهٔ گنو است."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid "But when people come across it, will they feel it relates to them?"
 msgstr ""
 "اما هنگامی که مردم با اینها برخورد م
ی‌کنند، آیا احساس خواهند کرد که این موضوع "
 "به آنان مربوط می‌شود؟"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "People who know they are using a system that came out of the GNU Project "
+#| "can see a direct relationship between themselves and GNU.  They won't "
+#| "automatically agree with our philosophy, but at least they will see a "
+#| "reason to think seriously about it.  In contrast, people who consider "
+#| "themselves &ldquo;Linux users&rdquo;, and believe that the GNU Project "
+#| "&ldquo;developed tools which proved to be useful in Linux&rdquo;, "
+#| "typically perceive only an indirect relationship between GNU and "
+#| "themselves.  They may just ignore the GNU philosophy when they come "
+#| "across it."
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
 "automatically agree with our philosophy, but at least they will see a reason "
 "to think seriously about it.  In contrast, people who consider themselves "
-"&ldquo;Linux users&rdquo;, and believe that the GNU Project &ldquo;developed "
-"tools which proved to be useful in Linux&rdquo;, typically perceive only an "
+"&ldquo;Linux users,&rdquo; and believe that the GNU Project &ldquo;developed "
+"tools which proved to be useful in Linux,&rdquo; typically perceive only an "
 "indirect relationship between GNU and themselves.  They may just ignore the "
 "GNU philosophy when they come across it."
 msgstr ""
@@ -440,11 +464,19 @@
 "هستند&ldquo;، به طور معمول ارتباطی غیر مستقیم 
میان خود و گنو می‌یابند. ممکن "
 "است هنگامی که به فلسفهٔ گنو برخورد م
ی‌کنند آن را ندید بگیرند."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Project is idealistic, and anyone encouraging idealism today "
+#| "faces a great obstacle: the prevailing ideology encourages people to "
+#| "dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been "
+#| "extremely practical: it is the reason we have a free <a href=\"/gnu/linux-"
+#| "and-gnu.html\">GNU/Linux</a> operating system.  People who love this "
+#| "system ought to know that it is our idealism made real."
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
-"idealism as &ldquo;impractical&rdquo;.  Our idealism has been extremely "
+"idealism as &ldquo;impractical.&rdquo; Our idealism has been extremely "
 "practical: it is the reason we have a free <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> operating system.  People who love this system ought to "
 "know that it is our idealism made real."
@@ -456,7 +488,7 @@
 "gnu.html\">گنو/لینوکس</a> را در اختیار داریم. 
افرادی که عاشق این سیستم هستند "
 "باید بدانند که ایده‌آل‌گراییِ ما آن را به 
حقیقت تبدیل کرده است."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If &ldquo;the job&rdquo; really were done, if there were nothing at stake "
 "except credit, perhaps it would be wiser to let the matter drop.  But we are "
@@ -472,6 +504,21 @@
 "سیستم‌عامل با نام <a 
href=\"/gnu/linux-and-gnu.html\">گنو/لینوکس</a> ما را "
 "یاری کنید."
 
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"این مقاله در <a 
href=\"http://shop.fsf.org/product/free-software-free-";
+"society/\"><cite>نرم‌افزار آزاد، جامعه آزاد: م
قالات منتخب ریچارد استالمن</"
+"cite></a> منتشر شده‌است."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -519,8 +566,7 @@
 
 #. type: Content of: <div><p>
 #, fuzzy
-msgid ""
-"Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
 msgstr ""
 "<span dir=\"ltr\">Copyright &copy; 2000, 2006, 2007 Richard Stallman</span>"
 
@@ -545,6 +591,15 @@
 msgstr "آخرین به روز رسانی:"
 
 #~ 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>."
+#~ msgstr ""
+#~ "این مقاله در <a 
href=\"http://shop.fsf.org/product/free-software-free-";
+#~ "society/\"><cite>نرم‌افزار آزاد، جامعهٔ آزاد: م
نتخب مقالات ریچارد استالمن</"
+#~ "cite></a> منتشر شده است."
+
+#~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"
 #~ msgstr ""

Index: gnu/po/why-gnu-linux.fr.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.fr.po,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- gnu/po/why-gnu-linux.fr.po  4 Jul 2021 18:22:45 -0000       1.59
+++ gnu/po/why-gnu-linux.fr.po  30 Aug 2021 13:34:54 -0000      1.60
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: why-gnu-linux.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+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"
@@ -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-08-30 13:26+0000\n"
 "Plural-Forms: \n"
 "X-Generator: Gtranslator 2.91.5\n"
 
@@ -24,47 +25,41 @@
 msgid "Why GNU/Linux? - GNU Project - Free Software Foundation"
 msgstr "Pourquoi GNU/Linux ? - Projet GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "What's in a Name?"
 msgstr "Qu'y a-t-il dans un nom ?"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "par <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
-"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>, which gives a history of the GNU/Linux "
-"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Si vous souhaitez en savoir plus sur ce sujet, vous pouvez aussi consulter "
-"notre <a href=\"/gnu/gnu-linux-faq.html\">FAQ GNU/Linux</a>, notre page <a "
-"href=\"/gnu/linux-and-gnu.html\">Linux et le projet GNU</a>, qui donne une "
-"histoire du système GNU/Linux s'intéressant à la question du nom, et notre 
"
-"page sur <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">les utilisateurs "
-"de GNU qui n'ont jamais entendu parler de GNU</a>."
-
 #. type: Content of: <div><p>
-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>."
-msgstr ""
-"Cet essai est publié dans <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>."
-
-#. type: Content of: <div><div><p>
+# | Names convey meanings; our choice of names determines the meaning of what
+# | we say.  An inappropriate name gives people the wrong idea.  A rose by any
+# | other name would smell as sweet&mdash;but if you call it a pen, people
+# | will be rather disappointed when they try to write with it.  And if you
+# | call pens [-&ldquo;roses&rdquo;,-] {+&ldquo;roses,&rdquo;+} people may not
+# | realize what they are good for.  If you call our operating system Linux,
+# | that conveys a mistaken idea of the system's origin, history, and purpose.
+# |  If you call it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that
+# | conveys (though not in detail) an accurate idea.
+#, fuzzy
+#| msgid ""
+#| "Names convey meanings; our choice of names determines the meaning of what "
+#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
+#| "any other name would smell as sweet&mdash;but if you call it a pen, "
+#| "people will be rather disappointed when they try to write with it.  And "
+#| "if you call pens &ldquo;roses&rdquo;, people may not realize what they "
+#| "are good for.  If you call our operating system Linux, that conveys a "
+#| "mistaken idea of the system's origin, history, and purpose.  If you call "
+#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
+#| "(though not in detail) an accurate idea."
 msgid ""
 "Names convey meanings; our choice of names determines the meaning of what we "
 "say.  An inappropriate name gives people the wrong idea.  A rose by any "
 "other name would smell as sweet&mdash;but if you call it a pen, people will "
 "be rather disappointed when they try to write with it.  And if you call pens "
-"&ldquo;roses&rdquo;, people may not realize what they are good for.  If you "
+"&ldquo;roses,&rdquo; people may not realize what they are good for.  If you "
 "call our operating system Linux, that conveys a mistaken idea of the "
 "system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
 "and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
@@ -82,6 +77,37 @@
 "une idée juste."
 
 #. type: Content of: <div><div><p>
+# | To learn more about this issue, you can read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
+# | {+System</a>,+} which gives a history of the GNU/Linux system as it
+# | relates to this issue of naming, and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+#| "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu."
+#| "html\">Linux and the GNU Project</a>, which gives a history of the GNU/"
+#| "Linux system as it relates to this issue of naming, and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>, which gives a history of the GNU/Linux "
+"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Si vous souhaitez en savoir plus sur ce sujet, vous pouvez aussi consulter "
+"notre <a href=\"/gnu/gnu-linux-faq.html\">FAQ GNU/Linux</a>, notre page <a "
+"href=\"/gnu/linux-and-gnu.html\">Linux et le projet GNU</a>, qui donne une "
+"histoire du système GNU/Linux s'intéressant à la question du nom, et notre 
"
+"page sur <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">les utilisateurs "
+"de GNU qui n'ont jamais entendu parler de GNU</a>."
+
+#. type: Content of: <div><p>
 msgid ""
 "Does this really matter for our community? Is it important whether people "
 "know the system's origin, history, and purpose? Yes&mdash;because people who "
@@ -97,7 +123,7 @@
 "\">GNU/Linux</a> n'est pas en sécurité ; les problèmes qui nous ont 
amenés à "
 "développer GNU ne sont pas complètement éradiqués et ils menacent de 
revenir."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
@@ -106,7 +132,7 @@
 "« GNU/Linux » plutôt que « Linux », les gens répondent parfois de 
la manière "
 "suivante :"
 
-#. type: Content of: <div><div><blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "<em> Granted that the GNU Project deserves credit for this work, is it "
 "really worth a fuss when people don't give credit? Isn't the important thing "
@@ -119,7 +145,7 @@
 "fait ? Vous devriez vous calmer, être fiers du travail bien fait et ne pas "
 "vous soucier de reconnaissance.</em>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "This would be wise advice, if only the situation were like that&mdash;if the "
 "job were done and it were time to relax.  If only that were true! But "
@@ -136,7 +162,7 @@
 "\">GNU/Linux</a> est une manière pour les gens de s'en souvenir, pour "
 "ensuite informer les autres de ces buts."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "It is possible to write good free software without thinking of GNU; much "
 "good work has been done in the name of Linux also.  But the term &ldquo;"
@@ -152,7 +178,27 @@
 "entreprises, nous aurons de plus en plus de mal à le connecter à l'esprit "
 "communautaire."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | A great challenge to the future of free software comes from the tendency
+# | of the &ldquo;Linux&rdquo; distribution companies to add nonfree software
+# | to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of
+# | convenience and power.  All the major commercial distribution developers
+# | do this; none limits itself to free software.  Most of them do not clearly
+# | identify the nonfree packages in their distributions.  Many even develop
+# | nonfree software and add it to the system.  Some outrageously advertise
+# | &ldquo;Linux&rdquo; systems that are &ldquo;licensed per [-seat&rdquo;,-]
+# | {+seat,&rdquo;+} which give the user as much freedom as Microsoft Windows.
+#, fuzzy
+#| msgid ""
+#| "A great challenge to the future of free software comes from the tendency "
+#| "of the &ldquo;Linux&rdquo; distribution companies to add nonfree software "
+#| "to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of "
+#| "convenience and power.  All the major commercial distribution developers "
+#| "do this; none limits itself to free software.  Most of them do not "
+#| "clearly identify the nonfree packages in their distributions.  Many even "
+#| "develop nonfree software and add it to the system.  Some outrageously "
+#| "advertise &ldquo;Linux&rdquo; systems that are &ldquo;licensed per "
+#| "seat&rdquo;, which give the user as much freedom as Microsoft Windows."
 msgid ""
 "A great challenge to the future of free software comes from the tendency of "
 "the &ldquo;Linux&rdquo; distribution companies to add nonfree software to <a "
@@ -161,7 +207,7 @@
 "limits itself to free software.  Most of them do not clearly identify the "
 "nonfree packages in their distributions.  Many even develop nonfree software "
 "and add it to the system.  Some outrageously advertise &ldquo;Linux&rdquo; "
-"systems that are &ldquo;licensed per seat&rdquo;, which give the user as "
+"systems that are &ldquo;licensed per seat,&rdquo; which give the user as "
 "much freedom as Microsoft Windows."
 msgstr ""
 "Un grand défi pour l'avenir du logiciel libre vient de la tendance des "
@@ -176,7 +222,29 @@
 "par poste, ce qui donne à l'utilisateur autant de liberté que Microsoft "
 "Windows."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People try to justify adding nonfree software in the name of the
+# | &ldquo;popularity of Linux&rdquo;&mdash;in effect, valuing popularity
+# | above freedom.  Sometimes this is openly admitted.  For instance, Wired
+# | Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;feels
+# | that the move toward open source software should be fueled by technical,
+# | rather than political, decisions.&rdquo; And Caldera's <abbr title=\"Chief
+# | Executive Officer\">CEO</abbr> openly urged users to <a
+# | href=\"http{+s+}://www.zdnet.com/article/stallman-love-is-not-free/\">drop
+# | the goal of freedom and work instead for the &ldquo;popularity of
+# | Linux&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "People try to justify adding nonfree software in the name of the &ldquo;"
+#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
+#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
+#| "Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;"
+#| "feels that the move toward open source software should be fueled by "
+#| "technical, rather than political, decisions.&rdquo; And Caldera's <abbr "
+#| "title=\"Chief Executive Officer\">CEO</abbr> openly urged users to <a "
+#| "href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
+#| "goal of freedom and work instead for the &ldquo;popularity of Linux&rdquo;"
+#| "</a>."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -184,7 +252,7 @@
 "said that Robert McMillan, editor of Linux Magazine, &ldquo;feels that the "
 "move toward open source software should be fueled by technical, rather than "
 "political, decisions.&rdquo; And Caldera's <abbr title=\"Chief Executive "
-"Officer\">CEO</abbr> openly urged users to <a href=\"http://www.zdnet.com/";
+"Officer\">CEO</abbr> openly urged users to <a href=\"https://www.zdnet.com/";
 "article/stallman-love-is-not-free/\">drop the goal of freedom and work "
 "instead for the &ldquo;popularity of Linux&rdquo;</a>."
 msgstr ""
@@ -198,7 +266,7 @@
 "article/stallman-love-is-not-free/\">laisser tomber l'objectif de la liberté 
"
 "pour travailler à la place en faveur de « la popularité de Linux »</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -217,7 +285,7 @@
 "objectif, qui est la liberté. Ça ne sert à rien de conduire plus vite si "
 "l'on ne peut pas rester sur la route."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, it "
 "can become a trap for free software developers.  When they write free "
@@ -240,7 +308,7 @@
 "de Sun a eu un effet similaire : <a href=\"/philosophy/java-trap.html\">le "
 "piège Java</a>, qui maintenant a presque disparu, heureusement."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -257,7 +325,7 @@
 "libres que les utilisateurs espèrent trouver avec. Si cela arrive, notre "
 "campagne pour la liberté aura échoué."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -282,7 +350,7 @@
 "brevetés et secrets sera de <strong>rejeter les programmes non libres qui "
 "les utilisent</strong>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -301,7 +369,7 @@
 "se battent pour leur liberté et leur communauté, la détermination de tenir 
"
 "pendant des années et de ne pas abandonner."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "In our community, this goal and this determination emanate mainly from the "
 "GNU Project.  We're the ones who talk about freedom and community as "
@@ -328,20 +396,40 @@
 "susceptibles de croiser les idées de liberté et de détermination est le "
 "projet GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid "But when people come across it, will they feel it relates to them?"
 msgstr ""
 "Mais quand les gens croiseront ces idées, est-ce qu'ils se sentiront "
 "concernés ?"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People who know they are using a system that came out of the GNU Project
+# | can see a direct relationship between themselves and GNU.  They won't
+# | automatically agree with our philosophy, but at least they will see a
+# | reason to think seriously about it.  In contrast, people who consider
+# | themselves &ldquo;Linux [-users&rdquo;,-] {+users,&rdquo;+} and believe
+# | that the GNU Project &ldquo;developed tools which proved to be useful in
+# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} typically perceive only an indirect
+# | relationship between GNU and themselves.  They may just ignore the GNU
+# | philosophy when they come across it.
+#, fuzzy
+#| msgid ""
+#| "People who know they are using a system that came out of the GNU Project "
+#| "can see a direct relationship between themselves and GNU.  They won't "
+#| "automatically agree with our philosophy, but at least they will see a "
+#| "reason to think seriously about it.  In contrast, people who consider "
+#| "themselves &ldquo;Linux users&rdquo;, and believe that the GNU Project "
+#| "&ldquo;developed tools which proved to be useful in Linux&rdquo;, "
+#| "typically perceive only an indirect relationship between GNU and "
+#| "themselves.  They may just ignore the GNU philosophy when they come "
+#| "across it."
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
 "automatically agree with our philosophy, but at least they will see a reason "
 "to think seriously about it.  In contrast, people who consider themselves "
-"&ldquo;Linux users&rdquo;, and believe that the GNU Project &ldquo;developed "
-"tools which proved to be useful in Linux&rdquo;, typically perceive only an "
+"&ldquo;Linux users,&rdquo; and believe that the GNU Project &ldquo;developed "
+"tools which proved to be useful in Linux,&rdquo; typically perceive only an "
 "indirect relationship between GNU and themselves.  They may just ignore the "
 "GNU philosophy when they come across it."
 msgstr ""
@@ -354,11 +442,26 @@
 "habituellement qu'une relation indirecte entre GNU et eux. Ils peuvent tout "
 "simplement passer à côté de la philosophie de GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project is idealistic, and anyone encouraging idealism today faces
+# | a great obstacle: the prevailing ideology encourages people to dismiss
+# | idealism as [-&ldquo;impractical&rdquo;.-] {+&ldquo;impractical.&rdquo;+}
+# | Our idealism has been extremely practical: it is the reason we have a free
+# | <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> operating system. 
+# | People who love this system ought to know that it is our idealism made
+# | real.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project is idealistic, and anyone encouraging idealism today "
+#| "faces a great obstacle: the prevailing ideology encourages people to "
+#| "dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been "
+#| "extremely practical: it is the reason we have a free <a href=\"/gnu/linux-"
+#| "and-gnu.html\">GNU/Linux</a> operating system.  People who love this "
+#| "system ought to know that it is our idealism made real."
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
-"idealism as &ldquo;impractical&rdquo;.  Our idealism has been extremely "
+"idealism as &ldquo;impractical.&rdquo; Our idealism has been extremely "
 "practical: it is the reason we have a free <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> operating system.  People who love this system ought to "
 "know that it is our idealism made real."
@@ -371,7 +474,7 @@
 "linux-and-gnu.html\">GNU/Linux</a>. Les personnes qui aiment ce système "
 "devraient savoir que c'est une concrétisation de notre idéalisme."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If &ldquo;the job&rdquo; really were done, if there were nothing at stake "
 "except credit, perhaps it would be wiser to let the matter drop.  But we are "
@@ -387,6 +490,22 @@
 "ce que nous avons déjà fait. S'il vous plaît, aidez-nous en appelant le "
 "système d'exploitation <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>."
 
+#. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "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>."
+msgid ""
+"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 ""
+"Cet article est publié dans le livre <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>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -431,8 +550,12 @@
 "traduction</a> les infos nécessaires."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+# | Copyright &copy; 2000, [-2006,-] 2007, [-2014-2016, 2020,-] 2021 Richard
+# | Stallman
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
 
@@ -458,3 +581,12 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Dernière mise à jour :"
+
+#~ 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>."
+#~ msgstr ""
+#~ "Cet essai est publié dans <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>."

Index: gnu/po/why-gnu-linux.hr.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.hr.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- gnu/po/why-gnu-linux.hr.po  30 May 2021 19:32:26 -0000      1.17
+++ gnu/po/why-gnu-linux.hr.po  30 Aug 2021 13:34:55 -0000      1.18
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: why-gnu-linux.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2013-06-13 16:59+0100\n"
 "Last-Translator: Nevenko Baričević <nevenko3@gmail.com>\n"
 "Language-Team: GNU Croatian Translation Team <www-hr-lista@gnu.org>\n"
@@ -15,6 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Poedit 1.5.4\n"
@@ -23,47 +24,41 @@
 msgid "Why GNU/Linux? - GNU Project - Free Software Foundation"
 msgstr "Zašto GNU/Linux? - Projekt GNU - Zaklada za slobodan softver"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "What's in a Name?"
 msgstr "Što znači ime?<sup><a href=\"#TransNote1\">1</a></sup>"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "napisao <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
-"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>, which gives a history of the GNU/Linux "
-"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Da biste saznali više o ovom pitanju, možete pročitati naša <a 
href=\"/gnu/"
-"gnu-linux-faq.html\">ČPP o GNU/Linuxu</a>, našu stranicu <a href=\"/gnu/"
-"linux-and-gnu.html\">Linux i Projekt GNU</a>, koja prikazuje povijest "
-"sustava GNU/Linux u odnosu na ovo pitanje oko naziva, i našu stranicu <a "
-"href=\"/gnu/gnu-users-never-heard-of-gnu.html\">Korisnici GNU-a koji nisu "
-"nikada čuli za GNU</a>."
-
 #. type: Content of: <div><p>
-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>."
-msgstr ""
-"Ovaj esej je objavljen u <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>."
-
-#. type: Content of: <div><div><p>
+# | Names convey meanings; our choice of names determines the meaning of what
+# | we say.  An inappropriate name gives people the wrong idea.  A rose by any
+# | other name would smell as sweet&mdash;but if you call it a pen, people
+# | will be rather disappointed when they try to write with it.  And if you
+# | call pens [-&ldquo;roses&rdquo;,-] {+&ldquo;roses,&rdquo;+} people may not
+# | realize what they are good for.  If you call our operating system Linux,
+# | that conveys a mistaken idea of the system's origin, history, and purpose.
+# |  If you call it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that
+# | conveys (though not in detail) an accurate idea.
+#, fuzzy
+#| msgid ""
+#| "Names convey meanings; our choice of names determines the meaning of what "
+#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
+#| "any other name would smell as sweet&mdash;but if you call it a pen, "
+#| "people will be rather disappointed when they try to write with it.  And "
+#| "if you call pens &ldquo;roses&rdquo;, people may not realize what they "
+#| "are good for.  If you call our operating system Linux, that conveys a "
+#| "mistaken idea of the system's origin, history, and purpose.  If you call "
+#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
+#| "(though not in detail) an accurate idea."
 msgid ""
 "Names convey meanings; our choice of names determines the meaning of what we "
 "say.  An inappropriate name gives people the wrong idea.  A rose by any "
 "other name would smell as sweet&mdash;but if you call it a pen, people will "
 "be rather disappointed when they try to write with it.  And if you call pens "
-"&ldquo;roses&rdquo;, people may not realize what they are good for.  If you "
+"&ldquo;roses,&rdquo; people may not realize what they are good for.  If you "
 "call our operating system Linux, that conveys a mistaken idea of the "
 "system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
 "and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
@@ -80,6 +75,37 @@
 "html\">GNU/Linux</a>, to izražava (iako ne u potpunosti) točan smisao."
 
 #. type: Content of: <div><div><p>
+# | To learn more about this issue, you can read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
+# | {+System</a>,+} which gives a history of the GNU/Linux system as it
+# | relates to this issue of naming, and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+#| "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu."
+#| "html\">Linux and the GNU Project</a>, which gives a history of the GNU/"
+#| "Linux system as it relates to this issue of naming, and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>, which gives a history of the GNU/Linux "
+"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Da biste saznali više o ovom pitanju, možete pročitati naša <a 
href=\"/gnu/"
+"gnu-linux-faq.html\">ČPP o GNU/Linuxu</a>, našu stranicu <a href=\"/gnu/"
+"linux-and-gnu.html\">Linux i Projekt GNU</a>, koja prikazuje povijest "
+"sustava GNU/Linux u odnosu na ovo pitanje oko naziva, i našu stranicu <a "
+"href=\"/gnu/gnu-users-never-heard-of-gnu.html\">Korisnici GNU-a koji nisu "
+"nikada čuli za GNU</a>."
+
+#. type: Content of: <div><p>
 msgid ""
 "Does this really matter for our community? Is it important whether people "
 "know the system's origin, history, and purpose? Yes&mdash;because people who "
@@ -95,7 +121,7 @@
 "opstati; problemi koji su nas naveli da razvijemo GNU nisu u potpunosti "
 "iskorijenjeni i prijete povratkom."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
@@ -103,7 +129,7 @@
 "Kada objašnjavam zašto je prikladnije da se operacijski sustav zove GNU/"
 "Linux od toga da se zove Linux, ljudi ponekad uzvraćaju na sljedeći način:"
 
-#. type: Content of: <div><div><blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "<em> Granted that the GNU Project deserves credit for this work, is it "
 "really worth a fuss when people don't give credit? Isn't the important thing "
@@ -115,7 +141,7 @@
 "je važna ta što je djelo napravljeno, a ne tko ga je napravio? Trebali bi 
se "
 "opustiti, ponositi se dobro obavljenim poslom i ne brinuti o priznanju.</em>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "This would be wise advice, if only the situation were like that&mdash;if the "
 "job were done and it were time to relax.  If only that were true! But "
@@ -131,7 +157,7 @@
 "Korištenje imena <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> način je 
"
 "na koji ljudi mogu podsjetiti sebe i uputiti druge u te ciljeve."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "It is possible to write good free software without thinking of GNU; much "
 "good work has been done in the name of Linux also.  But the term &ldquo;"
@@ -146,7 +172,27 @@
 "predanost slobodi da bi se surađivalo. Budući da to ime sve češće 
koriste "
 "tvrtke, bit će nam još teže povezati ga s duhom zajednice."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | A great challenge to the future of free software comes from the tendency
+# | of the &ldquo;Linux&rdquo; distribution companies to add nonfree software
+# | to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of
+# | convenience and power.  All the major commercial distribution developers
+# | do this; none limits itself to free software.  Most of them do not clearly
+# | identify the nonfree packages in their distributions.  Many even develop
+# | nonfree software and add it to the system.  Some outrageously advertise
+# | &ldquo;Linux&rdquo; systems that are &ldquo;licensed per [-seat&rdquo;,-]
+# | {+seat,&rdquo;+} which give the user as much freedom as Microsoft Windows.
+#, fuzzy
+#| msgid ""
+#| "A great challenge to the future of free software comes from the tendency "
+#| "of the &ldquo;Linux&rdquo; distribution companies to add nonfree software "
+#| "to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of "
+#| "convenience and power.  All the major commercial distribution developers "
+#| "do this; none limits itself to free software.  Most of them do not "
+#| "clearly identify the nonfree packages in their distributions.  Many even "
+#| "develop nonfree software and add it to the system.  Some outrageously "
+#| "advertise &ldquo;Linux&rdquo; systems that are &ldquo;licensed per "
+#| "seat&rdquo;, which give the user as much freedom as Microsoft Windows."
 msgid ""
 "A great challenge to the future of free software comes from the tendency of "
 "the &ldquo;Linux&rdquo; distribution companies to add nonfree software to <a "
@@ -155,7 +201,7 @@
 "limits itself to free software.  Most of them do not clearly identify the "
 "nonfree packages in their distributions.  Many even develop nonfree software "
 "and add it to the system.  Some outrageously advertise &ldquo;Linux&rdquo; "
-"systems that are &ldquo;licensed per seat&rdquo;, which give the user as "
+"systems that are &ldquo;licensed per seat,&rdquo; which give the user as "
 "much freedom as Microsoft Windows."
 msgstr ""
 "Veliki izazov budućnosti slobodnog softvera dolazi od sklonosti tvrtki koje "
@@ -168,7 +214,29 @@
 "licencirani prema broju korisnika&rdquo;, koji korisnicima daju isto toliko "
 "slobode koliko i Microsoft Windows."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People try to justify adding nonfree software in the name of the
+# | &ldquo;popularity of Linux&rdquo;&mdash;in effect, valuing popularity
+# | above freedom.  Sometimes this is openly admitted.  For instance, Wired
+# | Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;feels
+# | that the move toward open source software should be fueled by technical,
+# | rather than political, decisions.&rdquo; And Caldera's <abbr title=\"Chief
+# | Executive Officer\">CEO</abbr> openly urged users to <a
+# | href=\"http{+s+}://www.zdnet.com/article/stallman-love-is-not-free/\">drop
+# | the goal of freedom and work instead for the &ldquo;popularity of
+# | Linux&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "People try to justify adding nonfree software in the name of the &ldquo;"
+#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
+#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
+#| "Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;"
+#| "feels that the move toward open source software should be fueled by "
+#| "technical, rather than political, decisions.&rdquo; And Caldera's <abbr "
+#| "title=\"Chief Executive Officer\">CEO</abbr> openly urged users to <a "
+#| "href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
+#| "goal of freedom and work instead for the &ldquo;popularity of Linux&rdquo;"
+#| "</a>."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -176,7 +244,7 @@
 "said that Robert McMillan, editor of Linux Magazine, &ldquo;feels that the "
 "move toward open source software should be fueled by technical, rather than "
 "political, decisions.&rdquo; And Caldera's <abbr title=\"Chief Executive "
-"Officer\">CEO</abbr> openly urged users to <a href=\"http://www.zdnet.com/";
+"Officer\">CEO</abbr> openly urged users to <a href=\"https://www.zdnet.com/";
 "article/stallman-love-is-not-free/\">drop the goal of freedom and work "
 "instead for the &ldquo;popularity of Linux&rdquo;</a>."
 msgstr ""
@@ -190,7 +258,7 @@
 "not-free/\">odbace slobodu kao cilj i da umjesto toga rade na &ldquo;"
 "popularnosti Linuxa&rdquo;</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -208,7 +276,7 @@
 "zaboravlja na slobodu koja je cilj. Nije dobro voziti brže ako će vas to "
 "dovesti do slijetanja s ceste."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, it "
 "can become a trap for free software developers.  When they write free "
@@ -230,7 +298,7 @@
 "implementacija Jave imala je sličan učinak: <a 
href=\"/philosophy/java-trap."
 "html\">zamku Jave</a>, danas srećom većinom ispravljenu."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -247,7 +315,7 @@
 "očekivati da pripada uz njega. Ako se to dogodi, naša kampanja za slobodu "
 "doživjet će neuspjeh."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -270,7 +338,7 @@
 "nema jasnog načina borbe s patentiranim i tajnim formatima podataka osim "
 "<strong>odbacivanja neslobodnih programa koji ih koriste</strong>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -288,7 +356,7 @@
 "kada se bore za svoju slobodu i svoju zajednicu&mdash;odlučnost da izdržimo 
"
 "godinama i ne predamo se."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "In our community, this goal and this determination emanate mainly from the "
 "GNU Project.  We're the ones who talk about freedom and community as "
@@ -313,19 +381,39 @@
 "aplikacije. Glavno mjesto na kojem ljudi u našoj zajednici mogu naići na "
 "ideju slobode i odlučnosti je Projekt GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid "But when people come across it, will they feel it relates to them?"
 msgstr ""
 "No kada ljudi naiđu na nju, hoće li im se učiniti da se ona odnosi na 
njih?"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People who know they are using a system that came out of the GNU Project
+# | can see a direct relationship between themselves and GNU.  They won't
+# | automatically agree with our philosophy, but at least they will see a
+# | reason to think seriously about it.  In contrast, people who consider
+# | themselves &ldquo;Linux [-users&rdquo;,-] {+users,&rdquo;+} and believe
+# | that the GNU Project &ldquo;developed tools which proved to be useful in
+# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} typically perceive only an indirect
+# | relationship between GNU and themselves.  They may just ignore the GNU
+# | philosophy when they come across it.
+#, fuzzy
+#| msgid ""
+#| "People who know they are using a system that came out of the GNU Project "
+#| "can see a direct relationship between themselves and GNU.  They won't "
+#| "automatically agree with our philosophy, but at least they will see a "
+#| "reason to think seriously about it.  In contrast, people who consider "
+#| "themselves &ldquo;Linux users&rdquo;, and believe that the GNU Project "
+#| "&ldquo;developed tools which proved to be useful in Linux&rdquo;, "
+#| "typically perceive only an indirect relationship between GNU and "
+#| "themselves.  They may just ignore the GNU philosophy when they come "
+#| "across it."
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
 "automatically agree with our philosophy, but at least they will see a reason "
 "to think seriously about it.  In contrast, people who consider themselves "
-"&ldquo;Linux users&rdquo;, and believe that the GNU Project &ldquo;developed "
-"tools which proved to be useful in Linux&rdquo;, typically perceive only an "
+"&ldquo;Linux users,&rdquo; and believe that the GNU Project &ldquo;developed "
+"tools which proved to be useful in Linux,&rdquo; typically perceive only an "
 "indirect relationship between GNU and themselves.  They may just ignore the "
 "GNU philosophy when they come across it."
 msgstr ""
@@ -337,11 +425,26 @@
 "pod Linuxom&rdquo;, u pravilu primjećuju samo neizravnu vezu između GNU-a i 
"
 "sebe. Mogli bi jednostavno ignorirati filozofiju GNU-a kada na nju naiđu."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project is idealistic, and anyone encouraging idealism today faces
+# | a great obstacle: the prevailing ideology encourages people to dismiss
+# | idealism as [-&ldquo;impractical&rdquo;.-] {+&ldquo;impractical.&rdquo;+}
+# | Our idealism has been extremely practical: it is the reason we have a free
+# | <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> operating system. 
+# | People who love this system ought to know that it is our idealism made
+# | real.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project is idealistic, and anyone encouraging idealism today "
+#| "faces a great obstacle: the prevailing ideology encourages people to "
+#| "dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been "
+#| "extremely practical: it is the reason we have a free <a href=\"/gnu/linux-"
+#| "and-gnu.html\">GNU/Linux</a> operating system.  People who love this "
+#| "system ought to know that it is our idealism made real."
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
-"idealism as &ldquo;impractical&rdquo;.  Our idealism has been extremely "
+"idealism as &ldquo;impractical.&rdquo; Our idealism has been extremely "
 "practical: it is the reason we have a free <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> operating system.  People who love this system ought to "
 "know that it is our idealism made real."
@@ -353,7 +456,7 @@
 "linux-and-gnu.html\">GNU/Linux</a>. Ljudi koji vole ovaj sustav trebaju "
 "znati da je on naš ostvareni idealizam."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If &ldquo;the job&rdquo; really were done, if there were nothing at stake "
 "except credit, perhaps it would be wiser to let the matter drop.  But we are "
@@ -369,6 +472,25 @@
 "pomozite nam tako što ćete operacijski sustav zvati <a 
href=\"/gnu/linux-and-"
 "gnu.html\">GNU/Linux</a>."
 
+#. type: Content of: <div><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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Ovaj esej je objavljen u <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>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -417,8 +539,12 @@
 "prijevode</a>."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+# | Copyright &copy; 2000, [-2006,-] 2007, [-2014-2016, 2020,-] 2021 Richard
+# | Stallman
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
 
@@ -441,3 +567,12 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "Zadnji put promijenjeno:"
+
+#~ 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>."
+#~ msgstr ""
+#~ "Ovaj esej je objavljen u <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>."

Index: gnu/po/why-gnu-linux.it-diff.html
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.it-diff.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gnu/po/why-gnu-linux.it-diff.html   6 Jun 2021 17:59:20 -0000       1.1
+++ gnu/po/why-gnu-linux.it-diff.html   30 Aug 2021 13:34:55 -0000      1.2
@@ -10,51 +10,53 @@
 span.inserted { background-color: #2f2; color: #000; }
 </style></head>
 <body><pre>
-&lt;!--#include <span 
class="removed"><del><strong>virtual="/server/header.html"</strong></del></span>
 <span 
class="inserted"><ins><em>virtual="/server/html5-header.html"</em></ins></span> 
--&gt;
-&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.79</strong></del></span> <span 
class="inserted"><ins><em>1.96</em></ins></span> --&gt;
+&lt;!--#include virtual="/server/header.html" --&gt;
+&lt;!-- Parent-Version: <span 
class="removed"><del><strong>1.79</strong></del></span> <span 
class="inserted"><ins><em>1.96 --&gt;
+&lt;!-- This page is derived from 
/server/standards/boilerplate.html</em></ins></span> --&gt;
 &lt;title&gt;Why GNU/Linux?
 - GNU Project - Free Software Foundation&lt;/title&gt;
 &lt;!--#include virtual="/gnu/po/why-gnu-linux.translist" --&gt;
 &lt;!--#include virtual="/server/banner.html" --&gt;
-<span class="removed"><del><strong>&lt;h2&gt;What's</strong></del></span>
-<span class="inserted"><ins><em>&lt;h2 class="c"&gt;What's</em></ins></span> 
in a Name?&lt;/h2&gt;
+<span class="inserted"><ins><em>&lt;div class="article 
reduced-width"&gt;</em></ins></span>
+&lt;h2&gt;What's in a Name?&lt;/h2&gt;
 
 <span 
class="removed"><del><strong>&lt;p&gt;&lt;strong&gt;by</strong></del></span>
 
-<span class="inserted"><ins><em>&lt;address class="byline 
c"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;</strong></del></span>
-<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;
+<span class="inserted"><ins><em>&lt;address 
class="byline"&gt;by</em></ins></span> &lt;a <span 
class="removed"><del><strong>href="http://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
 
-&lt;div class="reduced-width"&gt;
-&lt;hr class="no-display" /&gt;</em></ins></span>
 &lt;div class="announcement"&gt;
-  <span 
class="removed"><del><strong>&lt;blockquote&gt;&lt;p&gt;To</strong></del></span>
-<span class="inserted"><ins><em>&lt;p&gt;To</em></ins></span> learn more about 
this issue, you can read
+  &lt;blockquote&gt;&lt;p&gt;To learn more about this issue, you can read
 our &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;, our page 
on 
 &lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU Project&lt;/a&gt;, 
which gives a history of the GNU/Linux system as it relates to this issue of 
naming, 
 and our page on &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU
-Users Who Have Never Heard of <span class="removed"><del><strong>GNU&lt;/a&gt;.
+Users Who Have Never Heard of GNU&lt;/a&gt;.
 
-&lt;/p&gt;&lt;/blockquote&gt;</strong></del></span> <span 
class="inserted"><ins><em>GNU&lt;/a&gt;.&lt;/p&gt;</em></ins></span>
-&lt;/div&gt;
-
-<span class="inserted"><ins><em>&lt;p id="fsfs"&gt;This essay is published in 
-&lt;a href="http://shop.fsf.org/product/free-software-free-society/"&gt;
-&lt;cite&gt;Free Software, Free Society: The Selected Essays of Richard 
-M. Stallman&lt;/cite&gt;&lt;/a&gt;.&lt;/p&gt;
-&lt;hr class="thin" /&gt;
+&lt;/p&gt;&lt;/blockquote&gt;
+&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>href="https://www.stallman.org/"&gt;Richard 
Stallman&lt;/a&gt;&lt;/address&gt;</em></ins></span>
 
-&lt;div class="article"&gt;</em></ins></span>
 &lt;p&gt;
 Names convey meanings; our choice of names determines the meaning of
 what we say.  An inappropriate name gives people the wrong idea.  A
 rose by any other name would smell as sweet&mdash;but if you call it a pen,
 people will be rather disappointed when they try to write with it.
-And if you call pens &ldquo;roses&rdquo;, people may not realize what
+And if you call pens <span 
class="removed"><del><strong>&ldquo;roses&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>&ldquo;roses,&rdquo;</em></ins></span> people may not 
realize what
 they are good for.  If you call our operating system
 Linux, that conveys a mistaken idea of the system's
 origin, history, and purpose.  If you call
 it &lt;a href="/gnu/linux-and-gnu.html"&gt;GNU/Linux&lt;/a&gt;, that conveys
 (though not in detail) an accurate idea.&lt;/p&gt;
+
+<span class="inserted"><ins><em>&lt;div class="announcement comment" 
role="complementary"&gt;
+&lt;hr class="no-display" /&gt;
+&lt;p&gt;To learn more about this issue, you can read
+our &lt;a href="/gnu/gnu-linux-faq.html"&gt;GNU/Linux FAQ&lt;/a&gt;, our page 
on 
+&lt;a href="/gnu/linux-and-gnu.html"&gt;Linux and the GNU System&lt;/a&gt;, 
which gives a history of the GNU/Linux system as it relates to this issue of 
naming, 
+and our page on &lt;a href="/gnu/gnu-users-never-heard-of-gnu.html"&gt;GNU
+Users Who Have Never Heard of GNU&lt;/a&gt;.&lt;/p&gt;
+&lt;hr class="no-display" /&gt;
+&lt;/div&gt;</em></ins></span>
+
 &lt;p&gt;
 Does this really matter for our community?  Is it important whether people
 know the system's origin, history, and purpose?  Yes&mdash;because people
@@ -104,7 +106,7 @@
 Most of them do not clearly identify the nonfree
 packages in their distributions.  Many even develop nonfree software
 and add it to the system.  Some outrageously advertise
-&ldquo;Linux&rdquo; systems that are &ldquo;licensed per seat&rdquo;,
+&ldquo;Linux&rdquo; systems that are &ldquo;licensed per <span 
class="removed"><del><strong>seat&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>seat,&rdquo;</em></ins></span>
 which give the user as much freedom as Microsoft Windows.&lt;/p&gt;
 
 &lt;p&gt;
@@ -116,7 +118,7 @@
 technical, rather than political, decisions.&rdquo; And Caldera's
 &lt;abbr title="Chief Executive Officer"&gt;CEO&lt;/abbr&gt; openly urged
 users
-to &lt;a href="http://www.zdnet.com/article/stallman-love-is-not-free/"&gt;drop
+to &lt;a <span 
class="removed"><del><strong>href="http://www.zdnet.com/article/stallman-love-is-not-free/"&gt;drop</strong></del></span>
 <span 
class="inserted"><ins><em>href="https://www.zdnet.com/article/stallman-love-is-not-free/"&gt;drop</em></ins></span>
 the goal of freedom and work instead for the &ldquo;popularity of
 Linux&rdquo;&lt;/a&gt;.&lt;/p&gt;
 
@@ -194,16 +196,17 @@
 Project can see a direct relationship between themselves and GNU.
 They won't automatically agree with our philosophy, but at least they
 will see a reason to think seriously about it.  In contrast, people
-who consider themselves &ldquo;Linux users&rdquo;, and believe that
+who consider themselves &ldquo;Linux <span 
class="removed"><del><strong>users&rdquo;,</strong></del></span> <span 
class="inserted"><ins><em>users,&rdquo;</em></ins></span> and believe that
 the GNU Project &ldquo;developed tools which proved to be useful in
-Linux&rdquo;, typically perceive only an indirect relationship between
+<span class="removed"><del><strong>Linux&rdquo;,</strong></del></span>
+<span class="inserted"><ins><em>Linux,&rdquo;</em></ins></span> typically 
perceive only an indirect relationship between
 GNU and themselves.  They may just ignore the GNU philosophy when they
 come across it.&lt;/p&gt;
 
 &lt;p&gt;
 The GNU Project is idealistic, and anyone encouraging idealism today
 faces a great obstacle: the prevailing ideology encourages people to
-dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been
+dismiss idealism as <span 
class="removed"><del><strong>&ldquo;impractical&rdquo;.</strong></del></span> 
<span class="inserted"><ins><em>&ldquo;impractical.&rdquo;</em></ins></span>  
Our idealism has been
 extremely practical: it is the reason we have a
 free &lt;a href="/gnu/linux-and-gnu.html"&gt;GNU/Linux&lt;/a&gt; operating 
system.
 People who love this system ought to know that it is our idealism made
@@ -217,12 +220,13 @@
 already done.  Please help us, by calling the operating
 system &lt;a href="/gnu/linux-and-gnu.html"&gt;GNU/Linux&lt;/a&gt;.&lt;/p&gt;
 
-<span class="removed"><del><strong>&lt;hr /&gt;
-&lt;blockquote id="fsfs"&gt;&lt;p&gt;This essay is published in 
-&lt;a href="http://shop.fsf.org/product/free-software-free-society/"&gt;
-&lt;cite&gt;Free Software, Free Society: The Selected Essays of Richard 
-M. 
Stallman&lt;/cite&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/blockquote&gt;</strong></del></span>
-<span class="inserted"><ins><em>&lt;/div&gt;
+&lt;hr <span class="inserted"><ins><em>class="no-display"</em></ins></span> 
/&gt;
+<span class="removed"><del><strong>&lt;blockquote 
id="fsfs"&gt;&lt;p&gt;This</strong></del></span>
+<span class="inserted"><ins><em>&lt;div class="edu-note c"&gt;&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;/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;
 &lt;/div&gt;</em></ins></span>
 
 &lt;/div&gt;&lt;!-- for id="content", starts in the include above --&gt;
@@ -272,7 +276,7 @@
      There is more detail about copyright years in the GNU Maintainers
      Information document, www.gnu.org/prep/maintain. --&gt;
 
-&lt;p&gt;Copyright &copy; 2000, 2006, 2007, <span 
class="removed"><del><strong>2014, 2015, 2016, 2020</strong></del></span> <span 
class="inserted"><ins><em>2014-2016, 2020, 2021</em></ins></span> Richard 
Stallman&lt;/p&gt;
+&lt;p&gt;Copyright &copy; 2000, <span 
class="removed"><del><strong>2006,</strong></del></span> 2007, <span 
class="removed"><del><strong>2014, 2015, 2016, 2020</strong></del></span> <span 
class="inserted"><ins><em>2021</em></ins></span> Richard Stallman&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
@@ -282,11 +286,12 @@
 
 &lt;p class="unprintable"&gt;Updated:
 &lt;!-- timestamp start --&gt;
-$Date: 2021/06/06 17:59:20 $
+$Date: 2021/08/30 13:34:55 $
 &lt;!-- timestamp end --&gt;
 &lt;/p&gt;
 &lt;/div&gt;
-&lt;/div&gt;
+<span class="removed"><del><strong>&lt;/div&gt;</strong></del></span>
+<span class="inserted"><ins><em>&lt;/div&gt;&lt;!-- for class="inner", starts 
in the banner include --&gt;</em></ins></span>
 &lt;/body&gt;
 &lt;/html&gt;
 </pre></body></html>

Index: gnu/po/why-gnu-linux.it.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.it.po,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- gnu/po/why-gnu-linux.it.po  30 Apr 2021 06:36:14 -0000      1.60
+++ gnu/po/why-gnu-linux.it.po  30 Aug 2021 13:34:55 -0000      1.61
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: why-gnu-linux.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2016-03-27 23:03+0100\n"
 "Last-Translator: Andrea Pescetti <pescetti@gnu.org>\n"
 "Language-Team: Italian\n"
@@ -23,51 +23,45 @@
 msgid "Why GNU/Linux? - GNU Project - Free Software Foundation"
 msgstr "Perché GNU/Linux? - Progetto GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "What's in a Name?"
 msgstr "Cosa c'è in un nome?"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 # | by <a href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a>
 #, fuzzy
 #| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "di <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
-"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>, which gives a history of the GNU/Linux "
-"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Per ulteriori informazioni su questo problema leggere la <a href=\"/gnu/gnu-"
-"linux-faq.html\">GNU/Linux FAQ</a>, la pagina su <a href=\"/gnu/linux-and-"
-"gnu.html\">Linux e il progetto GNU</a>, che spiega la storia del sistema GNU/"
-"Linux e come questa si rifletta sul problema del nome, e la pagina sugli <a "
-"href=\"/gnu/gnu-users-never-heard-of-gnu.html\">utenti GNU che non hanno mai "
-"sentito parlare di GNU</a>."
-
 #. type: Content of: <div><p>
-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>."
-msgstr ""
-"Questo testo è stato pubblicato 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>."
-
-#. type: Content of: <div><div><p>
+# | Names convey meanings; our choice of names determines the meaning of what
+# | we say.  An inappropriate name gives people the wrong idea.  A rose by any
+# | other name would smell as sweet&mdash;but if you call it a pen, people
+# | will be rather disappointed when they try to write with it.  And if you
+# | call pens [-&ldquo;roses&rdquo;,-] {+&ldquo;roses,&rdquo;+} people may not
+# | realize what they are good for.  If you call our operating system Linux,
+# | that conveys a mistaken idea of the system's origin, history, and purpose.
+# |  If you call it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that
+# | conveys (though not in detail) an accurate idea.
+#, fuzzy
+#| msgid ""
+#| "Names convey meanings; our choice of names determines the meaning of what "
+#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
+#| "any other name would smell as sweet&mdash;but if you call it a pen, "
+#| "people will be rather disappointed when they try to write with it.  And "
+#| "if you call pens &ldquo;roses&rdquo;, people may not realize what they "
+#| "are good for.  If you call our operating system Linux, that conveys a "
+#| "mistaken idea of the system's origin, history, and purpose.  If you call "
+#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
+#| "(though not in detail) an accurate idea."
 msgid ""
 "Names convey meanings; our choice of names determines the meaning of what we "
 "say.  An inappropriate name gives people the wrong idea.  A rose by any "
 "other name would smell as sweet&mdash;but if you call it a pen, people will "
 "be rather disappointed when they try to write with it.  And if you call pens "
-"&ldquo;roses&rdquo;, people may not realize what they are good for.  If you "
+"&ldquo;roses,&rdquo; people may not realize what they are good for.  If you "
 "call our operating system Linux, that conveys a mistaken idea of the "
 "system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
 "and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
@@ -85,6 +79,37 @@
 "(anche se non in dettaglio) un'idea accurata."
 
 #. type: Content of: <div><div><p>
+# | To learn more about this issue, you can read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
+# | {+System</a>,+} which gives a history of the GNU/Linux system as it
+# | relates to this issue of naming, and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+#| "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu."
+#| "html\">Linux and the GNU Project</a>, which gives a history of the GNU/"
+#| "Linux system as it relates to this issue of naming, and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>, which gives a history of the GNU/Linux "
+"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Per ulteriori informazioni su questo problema leggere la <a href=\"/gnu/gnu-"
+"linux-faq.html\">GNU/Linux FAQ</a>, la pagina su <a href=\"/gnu/linux-and-"
+"gnu.html\">Linux e il progetto GNU</a>, che spiega la storia del sistema GNU/"
+"Linux e come questa si rifletta sul problema del nome, e la pagina sugli <a "
+"href=\"/gnu/gnu-users-never-heard-of-gnu.html\">utenti GNU che non hanno mai "
+"sentito parlare di GNU</a>."
+
+#. type: Content of: <div><p>
 msgid ""
 "Does this really matter for our community? Is it important whether people "
 "know the system's origin, history, and purpose? Yes&mdash;because people who "
@@ -100,7 +125,7 @@
 "sopravvivere; i problemi che ci hanno portato a sviluppare GNU non sono "
 "stati completamente eliminati e minacciano di ripresentarsi."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
@@ -108,7 +133,7 @@
 "Quando spiego perché è più appropriato chiamare il sistema operativo 
\"GNU/"
 "Linux\" invece che \"Linux\", a volte ottengo questa risposta:"
 
-#. type: Content of: <div><div><blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "<em> Granted that the GNU Project deserves credit for this work, is it "
 "really worth a fuss when people don't give credit? Isn't the important thing "
@@ -121,7 +146,7 @@
 "non chi l'abbia fatto? Dovete    rilassarvi, essere orgogliosi del lavoro "
 "ben fatto e non    preoccuparvi del riconoscimento.</em>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "This would be wise advice, if only the situation were like that&mdash;if the "
 "job were done and it were time to relax.  If only that were true! But "
@@ -138,7 +163,7 @@
 "gnu.html\">GNU/Linux</a> è un modo perché le persone si ricordino e "
 "informino gli altri di questi obiettivi."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "It is possible to write good free software without thinking of GNU; much "
 "good work has been done in the name of Linux also.  But the term &ldquo;"
@@ -154,7 +179,27 @@
 "associare allo spirito comunitario dal momento che il nome viene utilizzato "
 "sempre di più dal mondo degli affari. "
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | A great challenge to the future of free software comes from the tendency
+# | of the &ldquo;Linux&rdquo; distribution companies to add nonfree software
+# | to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of
+# | convenience and power.  All the major commercial distribution developers
+# | do this; none limits itself to free software.  Most of them do not clearly
+# | identify the nonfree packages in their distributions.  Many even develop
+# | nonfree software and add it to the system.  Some outrageously advertise
+# | &ldquo;Linux&rdquo; systems that are &ldquo;licensed per [-seat&rdquo;,-]
+# | {+seat,&rdquo;+} which give the user as much freedom as Microsoft Windows.
+#, fuzzy
+#| msgid ""
+#| "A great challenge to the future of free software comes from the tendency "
+#| "of the &ldquo;Linux&rdquo; distribution companies to add nonfree software "
+#| "to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of "
+#| "convenience and power.  All the major commercial distribution developers "
+#| "do this; none limits itself to free software.  Most of them do not "
+#| "clearly identify the nonfree packages in their distributions.  Many even "
+#| "develop nonfree software and add it to the system.  Some outrageously "
+#| "advertise &ldquo;Linux&rdquo; systems that are &ldquo;licensed per "
+#| "seat&rdquo;, which give the user as much freedom as Microsoft Windows."
 msgid ""
 "A great challenge to the future of free software comes from the tendency of "
 "the &ldquo;Linux&rdquo; distribution companies to add nonfree software to <a "
@@ -163,7 +208,7 @@
 "limits itself to free software.  Most of them do not clearly identify the "
 "nonfree packages in their distributions.  Many even develop nonfree software "
 "and add it to the system.  Some outrageously advertise &ldquo;Linux&rdquo; "
-"systems that are &ldquo;licensed per seat&rdquo;, which give the user as "
+"systems that are &ldquo;licensed per seat,&rdquo; which give the user as "
 "much freedom as Microsoft Windows."
 msgstr ""
 "Una grande sfida al futuro del software libero viene dalla tendenza delle "
@@ -177,7 +222,29 @@
 "\" con \"licenze per postazione\", che danno all'utente la stessa libertà "
 "che gli è data da Microsoft Windows."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People try to justify adding nonfree software in the name of the
+# | &ldquo;popularity of Linux&rdquo;&mdash;in effect, valuing popularity
+# | above freedom.  Sometimes this is openly admitted.  For instance, Wired
+# | Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;feels
+# | that the move toward open source software should be fueled by technical,
+# | rather than political, decisions.&rdquo; And Caldera's <abbr title=\"Chief
+# | Executive Officer\">CEO</abbr> openly urged users to <a
+# | href=\"http{+s+}://www.zdnet.com/article/stallman-love-is-not-free/\">drop
+# | the goal of freedom and work instead for the &ldquo;popularity of
+# | Linux&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "People try to justify adding nonfree software in the name of the &ldquo;"
+#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
+#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
+#| "Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;"
+#| "feels that the move toward open source software should be fueled by "
+#| "technical, rather than political, decisions.&rdquo; And Caldera's <abbr "
+#| "title=\"Chief Executive Officer\">CEO</abbr> openly urged users to <a "
+#| "href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
+#| "goal of freedom and work instead for the &ldquo;popularity of Linux&rdquo;"
+#| "</a>."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -185,7 +252,7 @@
 "said that Robert McMillan, editor of Linux Magazine, &ldquo;feels that the "
 "move toward open source software should be fueled by technical, rather than "
 "political, decisions.&rdquo; And Caldera's <abbr title=\"Chief Executive "
-"Officer\">CEO</abbr> openly urged users to <a href=\"http://www.zdnet.com/";
+"Officer\">CEO</abbr> openly urged users to <a href=\"https://www.zdnet.com/";
 "article/stallman-love-is-not-free/\">drop the goal of freedom and work "
 "instead for the &ldquo;popularity of Linux&rdquo;</a>."
 msgstr ""
@@ -200,7 +267,7 @@
 "\">abbandonare l'obiettivo della libertà</a> ed a lavorare invece per la "
 "\"popolarità di Linux\"."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -218,7 +285,7 @@
 "fatto positivo e a dimenticare l'obiettivo della libertà. Non ha senso "
 "guidare più velocemente per poi uscire di strada."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, it "
 "can become a trap for free software developers.  When they write free "
@@ -242,7 +309,7 @@
 "trap.html\">trappola Java</a>, fortunatamente ormai evitata per la maggior "
 "parte."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -259,7 +326,7 @@
 "si aspettano di trovarlo. Se succederà, la nostra campagna per la libertà "
 "sarà fallita."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -283,7 +350,7 @@
 "formati di dati brevettati e segreti non avremo altro modo se non "
 "<strong>rifiutare i programmi non liberi che li utilizzano</strong>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -301,7 +368,7 @@
 "si ha quando si combatte per la libertà e la comunità, la determinazione a "
 "continuare per anni e a non mollare."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "In our community, this goal and this determination emanate mainly from the "
 "GNU Project.  We're the ones who talk about freedom and community as "
@@ -328,18 +395,38 @@
 "comunità si imbattano nell'idea di libertà e nella determinazione è il "
 "Progetto GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid "But when people come across it, will they feel it relates to them?"
 msgstr "Ma quando le persone vi si imbattono, sentono che riguarda anche loro?"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People who know they are using a system that came out of the GNU Project
+# | can see a direct relationship between themselves and GNU.  They won't
+# | automatically agree with our philosophy, but at least they will see a
+# | reason to think seriously about it.  In contrast, people who consider
+# | themselves &ldquo;Linux [-users&rdquo;,-] {+users,&rdquo;+} and believe
+# | that the GNU Project &ldquo;developed tools which proved to be useful in
+# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} typically perceive only an indirect
+# | relationship between GNU and themselves.  They may just ignore the GNU
+# | philosophy when they come across it.
+#, fuzzy
+#| msgid ""
+#| "People who know they are using a system that came out of the GNU Project "
+#| "can see a direct relationship between themselves and GNU.  They won't "
+#| "automatically agree with our philosophy, but at least they will see a "
+#| "reason to think seriously about it.  In contrast, people who consider "
+#| "themselves &ldquo;Linux users&rdquo;, and believe that the GNU Project "
+#| "&ldquo;developed tools which proved to be useful in Linux&rdquo;, "
+#| "typically perceive only an indirect relationship between GNU and "
+#| "themselves.  They may just ignore the GNU philosophy when they come "
+#| "across it."
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
 "automatically agree with our philosophy, but at least they will see a reason "
 "to think seriously about it.  In contrast, people who consider themselves "
-"&ldquo;Linux users&rdquo;, and believe that the GNU Project &ldquo;developed "
-"tools which proved to be useful in Linux&rdquo;, typically perceive only an "
+"&ldquo;Linux users,&rdquo; and believe that the GNU Project &ldquo;developed "
+"tools which proved to be useful in Linux,&rdquo; typically perceive only an "
 "indirect relationship between GNU and themselves.  They may just ignore the "
 "GNU philosophy when they come across it."
 msgstr ""
@@ -352,11 +439,26 @@
 "GNU. Questo tipo di persona potrebbe semplicemente ignorare la filosofia GNU "
 "quando vi si imbatte."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project is idealistic, and anyone encouraging idealism today faces
+# | a great obstacle: the prevailing ideology encourages people to dismiss
+# | idealism as [-&ldquo;impractical&rdquo;.-] {+&ldquo;impractical.&rdquo;+}
+# | Our idealism has been extremely practical: it is the reason we have a free
+# | <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> operating system. 
+# | People who love this system ought to know that it is our idealism made
+# | real.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project is idealistic, and anyone encouraging idealism today "
+#| "faces a great obstacle: the prevailing ideology encourages people to "
+#| "dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been "
+#| "extremely practical: it is the reason we have a free <a href=\"/gnu/linux-"
+#| "and-gnu.html\">GNU/Linux</a> operating system.  People who love this "
+#| "system ought to know that it is our idealism made real."
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
-"idealism as &ldquo;impractical&rdquo;.  Our idealism has been extremely "
+"idealism as &ldquo;impractical.&rdquo; Our idealism has been extremely "
 "practical: it is the reason we have a free <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> operating system.  People who love this system ought to "
 "know that it is our idealism made real."
@@ -368,7 +470,7 @@
 "href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> libero. Chi ama questo "
 "sistema deve sapere che è il nostro idealismo divenuto reale."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If &ldquo;the job&rdquo; really were done, if there were nothing at stake "
 "except credit, perhaps it would be wiser to let the matter drop.  But we are "
@@ -384,6 +486,25 @@
 "il lavoro fatto finora. Per favore aiutateci, chiamando <a href=\"/gnu/linux-"
 "and-gnu.html\">GNU/Linux</a> il sistema operativo."
 
+#. type: Content of: <div><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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Questo testo è stato pubblicato 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>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -437,13 +558,12 @@
 "traduzioni</a>."
 
 #. type: Content of: <div><p>
-# | Copyright &copy; 2000, 2006, 2007, [-2014, 2015, 2016, 2020-] {+2014-2016,
-# | 2020, 2021+} Richard Stallman
+# | Copyright &copy; 2000, [-2006,-] 2007, [-2014, 2015, 2016, 2020-] {+2021+}
+# | Richard Stallman
 #, fuzzy
 #| msgid ""
 #| "Copyright &copy; 2000, 2006, 2007, 2014, 2015, 2016, 2020 Richard Stallman"
-msgid ""
-"Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 2000, 2006, 2007, 2014, 2015, 2016, 2020 Richard Stallman"
 
@@ -472,6 +592,15 @@
 msgstr "Ultimo aggiornamento:"
 
 #~ 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>."
+#~ msgstr ""
+#~ "Questo testo è stato pubblicato 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 ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"
 #~ msgstr ""

Index: gnu/po/why-gnu-linux.ja.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.ja.po,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- gnu/po/why-gnu-linux.ja.po  1 Jul 2021 02:03:47 -0000       1.42
+++ gnu/po/why-gnu-linux.ja.po  30 Aug 2021 13:34:55 -0000      1.43
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: why-gnu-linux.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2017-01-17 16:33+0900\n"
 "Last-Translator: NIIBE Yutaka <gniibe@fsij.org>\n"
 "Language-Team: Japanese <web-translators-ja@gnu.org>\n"
@@ -15,53 +15,39 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 
 #. type: Content of: <title>
 msgid "Why GNU/Linux? - GNU Project - Free Software Foundation"
 msgstr ""
 "なぜGNU/Linuxなのか? - GNUプロジェクト - 
フリーソフトウェアファウンデーション"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "What's in a Name?"
 msgstr "名前が何であろうか?"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a 
href=\"https://www.stallman.org/\";>リチャード・ストールマン</a>著"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
-"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>, which gives a history of the GNU/Linux "
-"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"この問題についてさらに知るには、<a 
href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"Linux FAQ</a>、GNU/Linuxシステム
の歴史について述べていて名前の問題についても"
-"関連する<a 
href=\"/gnu/linux-and-gnu.html\">LinuxとGNUプロジェクト</a>につい"
-"てのわたしたちのページ、<a 
href=\"/gnu/gnu-users-never-heard-of-gnu.html"
-"\">GNUについてなにも聞いたことがないGNUユーザ</a>についてのわたしたちのページ"
-"をご覧ください。"
-
 #. type: Content of: <div><p>
-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>."
-msgstr ""
-"この小論は<a 
href=\"http://shop.fsf.org/product/free-software-free-society/";
-"\"><cite>自由ソフトウェア、自由な社会: 
リチャード・M・ストールマン小論選集</"
-"cite></a>に収録され、出版されました。"
-
-#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Names convey meanings; our choice of names determines the meaning of what "
+#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
+#| "any other name would smell as sweet&mdash;but if you call it a pen, "
+#| "people will be rather disappointed when they try to write with it.  And "
+#| "if you call pens &ldquo;roses&rdquo;, people may not realize what they "
+#| "are good for.  If you call our operating system Linux, that conveys a "
+#| "mistaken idea of the system's origin, history, and purpose.  If you call "
+#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
+#| "(though not in detail) an accurate idea."
 msgid ""
 "Names convey meanings; our choice of names determines the meaning of what we "
 "say.  An inappropriate name gives people the wrong idea.  A rose by any "
 "other name would smell as sweet&mdash;but if you call it a pen, people will "
 "be rather disappointed when they try to write with it.  And if you call pens "
-"&ldquo;roses&rdquo;, people may not realize what they are good for.  If you "
+"&ldquo;roses,&rdquo; people may not realize what they are good for.  If you "
 "call our operating system Linux, that conveys a mistaken idea of the "
 "system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
 "and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
@@ -77,6 +63,30 @@
 
"ば、それは(詳しくではありませんが)正確な考えを運びます。"
 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+#| "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu."
+#| "html\">Linux and the GNU Project</a>, which gives a history of the GNU/"
+#| "Linux system as it relates to this issue of naming, and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>, which gives a history of the GNU/Linux "
+"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"この問題についてさらに知るには、<a 
href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"Linux FAQ</a>、GNU/Linuxシステム
の歴史について述べていて名前の問題についても"
+"関連する<a 
href=\"/gnu/linux-and-gnu.html\">LinuxとGNUプロジェクト</a>につい"
+"てのわたしたちのページ、<a 
href=\"/gnu/gnu-users-never-heard-of-gnu.html"
+"\">GNUについてなにも聞いたことがないGNUユーザ</a>についてのわたしたちのページ"
+"をご覧ください。"
+
+#. type: Content of: <div><p>
 msgid ""
 "Does this really matter for our community? Is it important whether people "
 "know the system's origin, history, and purpose? Yes&mdash;because people who "
@@ -92,7 +102,7 @@
 
"とが保証されてはいないのです。GNUを開発することになった問題は完å
…¨ã«æ ¹çµ¶ã—たわ"
 "けではありません。それは戻ってくるぞと脅します。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
@@ -100,7 +110,7 @@
 "そのオペレーティング・システム
をLinuxではなくGNU/Linuxと呼ぶことが適切である"
 "理由を説明すると、人々は時々
、以下のように反応します。"
 
-#. type: Content of: <div><div><blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "<em> Granted that the GNU Project deserves credit for this work, is it "
 "really worth a fuss when people don't give credit? Isn't the important thing "
@@ -113,7 +123,7 @@
 "か。リラックスしてくだ
さい、良い仕事をしたことに対し誇りを持って、謝意に関し"
 "ては気にしないで。</em>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "This would be wise advice, if only the situation were like that&mdash;if the "
 "job were done and it were time to relax.  If only that were true! But "
@@ -129,7 +139,7 @@
 "ます。<a 
href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>の名前を使うことは人々"
 "にこれらの目標を思い起こさせほかの人々
に伝える一つの方法なのです。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "It is possible to write good free software without thinking of GNU; much "
 "good work has been done in the name of Linux also.  But the term &ldquo;"
@@ -144,7 +154,18 @@
 
"です。その名前はビジネスにどんどん使われていますから、コミュニティの精神とそ"
 
"れを結びつけるのに、わたしたちにはさらに多くのトラブルがあることでしょう。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "A great challenge to the future of free software comes from the tendency "
+#| "of the &ldquo;Linux&rdquo; distribution companies to add nonfree software "
+#| "to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of "
+#| "convenience and power.  All the major commercial distribution developers "
+#| "do this; none limits itself to free software.  Most of them do not "
+#| "clearly identify the nonfree packages in their distributions.  Many even "
+#| "develop nonfree software and add it to the system.  Some outrageously "
+#| "advertise &ldquo;Linux&rdquo; systems that are &ldquo;licensed per "
+#| "seat&rdquo;, which give the user as much freedom as Microsoft Windows."
 msgid ""
 "A great challenge to the future of free software comes from the tendency of "
 "the &ldquo;Linux&rdquo; distribution companies to add nonfree software to <a "
@@ -153,7 +174,7 @@
 "limits itself to free software.  Most of them do not clearly identify the "
 "nonfree packages in their distributions.  Many even develop nonfree software "
 "and add it to the system.  Some outrageously advertise &ldquo;Linux&rdquo; "
-"systems that are &ldquo;licensed per seat&rdquo;, which give the user as "
+"systems that are &ldquo;licensed per seat,&rdquo; which give the user as "
 "much freedom as Microsoft Windows."
 msgstr ""
 
"将来の自由ソフトウェアに対する重大な問題には、&ldquo;Linux&rdquo;ディストリ"
@@ -166,7 +187,19 @@
 "ライセンスされた」&ldquo;Linux&rdquo;システム
を宣伝します。それは利用者にマイ"
 
"クロソフト・ウィンドウズと同程度の自由しか提供しません。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "People try to justify adding nonfree software in the name of the &ldquo;"
+#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
+#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
+#| "Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;"
+#| "feels that the move toward open source software should be fueled by "
+#| "technical, rather than political, decisions.&rdquo; And Caldera's <abbr "
+#| "title=\"Chief Executive Officer\">CEO</abbr> openly urged users to <a "
+#| "href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
+#| "goal of freedom and work instead for the &ldquo;popularity of Linux&rdquo;"
+#| "</a>."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -174,7 +207,7 @@
 "said that Robert McMillan, editor of Linux Magazine, &ldquo;feels that the "
 "move toward open source software should be fueled by technical, rather than "
 "political, decisions.&rdquo; And Caldera's <abbr title=\"Chief Executive "
-"Officer\">CEO</abbr> openly urged users to <a href=\"http://www.zdnet.com/";
+"Officer\">CEO</abbr> openly urged users to <a href=\"https://www.zdnet.com/";
 "article/stallman-love-is-not-free/\">drop the goal of freedom and work "
 "instead for the &ldquo;popularity of Linux&rdquo;</a>."
 msgstr ""
@@ -187,7 +220,7 @@
 
"com/article/stallman-love-is-not-free/\">自由の目標を取り下げて、代わりに"
 
"「Linuxの人気」のために働くことをユーザにしきりに促しました</a>。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -205,7 +238,7 @@
 
"黙的に促します。道から外れてしまうのであれば、速度を出して運転することは良く"
 "ないでしょう。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, it "
 "can become a trap for free software developers.  When they write free "
@@ -226,7 +259,7 @@
 "Javaの実装は同様の効果をもたらしました。<a 
href=\"/philosophy/java-trap.html"
 "\">Javaの罠</a>は幸いにも今やほとんど修正されました。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -243,7 +276,7 @@
 
"トウェアは、ほとんど使えないようなことになってしまうでしょう。これが起これ"
 
"ば、わたしたちの自由へのキャンペーンは失敗してしまいます。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -266,7 +299,7 @@
 "とはできず、<strong>それを使う不自由なプログラム
拒絶する</strong>以外、ありま"
 "せん。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -283,7 +316,7 @@
 "のために闘うとき、人々には、ある種の決意が必
要となります。何年も続け、決して"
 "諦めない決意が。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "In our community, this goal and this determination emanate mainly from the "
 "GNU Project.  We're the ones who talk about freedom and community as "
@@ -307,20 +340,31 @@
 "そのようなアプリケーションのセールスマンを招待
します。わたしたちのコミュニ"
 "ティの人々が自由の考えと決意に出くわす主なå 
´æ‰€ã¯ã€GNUプロジェクトなのです。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid "But when people come across it, will they feel it relates to them?"
 msgstr ""
 "しかし、それに人々
が出くわしたとき、GNUプロジェクトとそれが関連していると感じ"
 "るでしょうか。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "People who know they are using a system that came out of the GNU Project "
+#| "can see a direct relationship between themselves and GNU.  They won't "
+#| "automatically agree with our philosophy, but at least they will see a "
+#| "reason to think seriously about it.  In contrast, people who consider "
+#| "themselves &ldquo;Linux users&rdquo;, and believe that the GNU Project "
+#| "&ldquo;developed tools which proved to be useful in Linux&rdquo;, "
+#| "typically perceive only an indirect relationship between GNU and "
+#| "themselves.  They may just ignore the GNU philosophy when they come "
+#| "across it."
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
 "automatically agree with our philosophy, but at least they will see a reason "
 "to think seriously about it.  In contrast, people who consider themselves "
-"&ldquo;Linux users&rdquo;, and believe that the GNU Project &ldquo;developed "
-"tools which proved to be useful in Linux&rdquo;, typically perceive only an "
+"&ldquo;Linux users,&rdquo; and believe that the GNU Project &ldquo;developed "
+"tools which proved to be useful in Linux,&rdquo; typically perceive only an "
 "indirect relationship between GNU and themselves.  They may just ignore the "
 "GNU philosophy when they come across it."
 msgstr ""
@@ -331,11 +375,19 @@
 "されたツールを開発した」と信じている人々は、å…
¸åž‹çš„にはGNUとかれら自身との間に"
 "間接的な関係だ
けに気がつくでしょう。GNUの理念を単に無視するかもしれません。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Project is idealistic, and anyone encouraging idealism today "
+#| "faces a great obstacle: the prevailing ideology encourages people to "
+#| "dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been "
+#| "extremely practical: it is the reason we have a free <a href=\"/gnu/linux-"
+#| "and-gnu.html\">GNU/Linux</a> operating system.  People who love this "
+#| "system ought to know that it is our idealism made real."
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
-"idealism as &ldquo;impractical&rdquo;.  Our idealism has been extremely "
+"idealism as &ldquo;impractical.&rdquo; Our idealism has been extremely "
 "practical: it is the reason we have a free <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> operating system.  People who love this system ought to "
 "know that it is our idealism made real."
@@ -347,7 +399,7 @@
 "たしたちが有する理由です。このシステムを愛する人々
は、わたしたちの理想主義が"
 "現実になったことを知るべきです。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If &ldquo;the job&rdquo; really were done, if there were nothing at stake "
 "except credit, perhaps it would be wiser to let the matter drop.  But we are "
@@ -363,6 +415,21 @@
 "ティング・システムを<a 
href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>と呼ぶこ"
 "とによって、わたしたちを手伝ってください。"
 
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"この小論は<a 
href=\"http://shop.fsf.org/product/free-software-free-society/";
+"\"><cite>自由ソフトウェア、自由な社会: 
リチャード・M・ストールマン小論選集</"
+"cite></a>に収録され、出版されました。"
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -405,8 +472,10 @@
 "README.translations.html\">翻訳 README</a>をご覧ください。"
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
 
@@ -431,6 +500,15 @@
 msgstr "最終更新:"
 
 #~ 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>."
+#~ msgstr ""
+#~ "この小論は<a href=\"http://shop.fsf.org/product/free-software-free-";
+#~ "society/\"><cite>自由ソフトウェア、自由な社会: 
リチャード・M・ストールマン"
+#~ "小論選集</cite></a>に収録され、出版されました。"
+
+#~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"
 #~ msgstr ""

Index: gnu/po/why-gnu-linux.ko.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.ko.po,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- gnu/po/why-gnu-linux.ko.po  7 Jun 2021 08:29:32 -0000       1.30
+++ gnu/po/why-gnu-linux.ko.po  30 Aug 2021 13:34:55 -0000      1.31
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: why-gnu-linux.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2016-05-21 16:52+0900\n"
 "Last-Translator: Chang-hun Song <chsong@gnu.org>\n"
 "Language-Team: Korean <www-ko-translators@gnu.org>\n"
@@ -18,52 +18,48 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 
 #. type: Content of: <title>
 msgid "Why GNU/Linux? - GNU Project - Free Software Foundation"
 msgstr ""
 "왜 GNU/리눅스라 불러야 하는가? - GNU 프로젝트 - 자유 
소프트웨어 재단 (FSF)"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "What's in a Name?"
 msgstr "왜 GNU/리눅스라 불러야 하는가?"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "글: <a href=\"https://www.stallman.org/\";>리처드 스톨먼</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
-"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>, which gives a history of the GNU/Linux "
-"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"이 주제에 대한 보다 상세한 내용들은 <a 
href=\"/gnu/gnu-linux-faq.html\">GNU/"
-"리눅스 FAQ</a>와 이름의 유래를 담고 있는 GNU/리눅스의 
역사에 대한 글인 <a "
-"href=\"/gnu/linux-and-gnu.html\">리눅스와 GNU 프로젝트</a> 그리고 
<a href=\"/"
-"gnu/gnu-users-never-heard-of-gnu.html\">GNU라는 말을 전혀 들어보지 
못한 GNU "
-"사용자</a>를 통해 참고할 수 있습니다."
-
 #. type: Content of: <div><p>
-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>."
-msgstr ""
-"이 글은 &lsquo;<a href=\"http://shop.fsf.org/product/free-software-free-";
-"society/\">자유 소프트웨어, 자유 사회: 리처드 M. 스톨먼 ì 
€ìž‘선집</a>&rsquo;"
-"에 포함되어 출판되었습니다."
-
-#. type: Content of: <div><div><p>
+# | Names convey meanings; our choice of names determines the meaning of what
+# | we say.  An inappropriate name gives people the wrong idea.  A rose by any
+# | other name would smell as sweet&mdash;but if you call it a pen, people
+# | will be rather disappointed when they try to write with it.  And if you
+# | call pens [-&ldquo;roses&rdquo;,-] {+&ldquo;roses,&rdquo;+} people may not
+# | realize what they are good for.  If you call our operating system Linux,
+# | that conveys a mistaken idea of the system's origin, history, and purpose.
+# |  If you call it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that
+# | conveys (though not in detail) an accurate idea.
+#, fuzzy
+#| msgid ""
+#| "Names convey meanings; our choice of names determines the meaning of what "
+#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
+#| "any other name would smell as sweet&mdash;but if you call it a pen, "
+#| "people will be rather disappointed when they try to write with it.  And "
+#| "if you call pens &ldquo;roses&rdquo;, people may not realize what they "
+#| "are good for.  If you call our operating system Linux, that conveys a "
+#| "mistaken idea of the system's origin, history, and purpose.  If you call "
+#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
+#| "(though not in detail) an accurate idea."
 msgid ""
 "Names convey meanings; our choice of names determines the meaning of what we "
 "say.  An inappropriate name gives people the wrong idea.  A rose by any "
 "other name would smell as sweet&mdash;but if you call it a pen, people will "
 "be rather disappointed when they try to write with it.  And if you call pens "
-"&ldquo;roses&rdquo;, people may not realize what they are good for.  If you "
+"&ldquo;roses,&rdquo; people may not realize what they are good for.  If you "
 "call our operating system Linux, that conveys a mistaken idea of the "
 "system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
 "and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
@@ -79,6 +75,36 @@
 "한 개념을 전할 수 있습니다."
 
 #. type: Content of: <div><div><p>
+# | To learn more about this issue, you can read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
+# | {+System</a>,+} which gives a history of the GNU/Linux system as it
+# | relates to this issue of naming, and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+#| "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu."
+#| "html\">Linux and the GNU Project</a>, which gives a history of the GNU/"
+#| "Linux system as it relates to this issue of naming, and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>, which gives a history of the GNU/Linux "
+"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"이 주제에 대한 보다 상세한 내용들은 <a 
href=\"/gnu/gnu-linux-faq.html\">GNU/"
+"리눅스 FAQ</a>와 이름의 유래를 담고 있는 GNU/리눅스의 
역사에 대한 글인 <a "
+"href=\"/gnu/linux-and-gnu.html\">리눅스와 GNU 프로젝트</a> 그리고 
<a href=\"/"
+"gnu/gnu-users-never-heard-of-gnu.html\">GNU라는 말을 전혀 들어보지 
못한 GNU "
+"사용자</a>를 통해 참고할 수 있습니다."
+
+#. type: Content of: <div><p>
 msgid ""
 "Does this really matter for our community? Is it important whether people "
 "know the system's origin, history, and purpose? Yes&mdash;because people who "
@@ -94,7 +120,7 @@
 "위태합니다. 우리가 GNU를 개발하게 만든 문제는 완전히 
사라지지 않았고 우리를 "
 "다시 위협하고 있습니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
@@ -102,7 +128,7 @@
 "리눅스가 아니라 GNU/리눅스라고 부르는 것이 적절하다는 
이유를 설명할 때 다음"
 "과 같이 반응하는 사람들이 종종 있습니다."
 
-#. type: Content of: <div><div><blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "<em> Granted that the GNU Project deserves credit for this work, is it "
 "really worth a fuss when people don't give credit? Isn't the important thing "
@@ -114,7 +140,7 @@
 "다는 사실 자체가 중요한 것 아닌가요? 마음을 느긋하게 
먹고 잘 한 일에 자부심"
 "을 가져야지, 공로에 대해 걱정하면 안 됩니다.</em>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "This would be wise advice, if only the situation were like that&mdash;if the "
 "job were done and it were time to relax.  If only that were true! But "
@@ -130,7 +156,7 @@
 "a>라는 이름을 쓰는 것은 사람들에게 이러한 목표를 
되새기고 알려주는 방법입니"
 "다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "It is possible to write good free software without thinking of GNU; much "
 "good work has been done in the name of Linux also.  But the term &ldquo;"
@@ -145,7 +171,27 @@
 "관되어 왔습니다. 리눅스라는 이름이 사업에 의해 점점 더 
쓰이면서 그것을 공동"
 "체 정신과 연결하는 데 더 많은 곤란을 겪기까지 할 것입
니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | A great challenge to the future of free software comes from the tendency
+# | of the &ldquo;Linux&rdquo; distribution companies to add nonfree software
+# | to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of
+# | convenience and power.  All the major commercial distribution developers
+# | do this; none limits itself to free software.  Most of them do not clearly
+# | identify the nonfree packages in their distributions.  Many even develop
+# | nonfree software and add it to the system.  Some outrageously advertise
+# | &ldquo;Linux&rdquo; systems that are &ldquo;licensed per [-seat&rdquo;,-]
+# | {+seat,&rdquo;+} which give the user as much freedom as Microsoft Windows.
+#, fuzzy
+#| msgid ""
+#| "A great challenge to the future of free software comes from the tendency "
+#| "of the &ldquo;Linux&rdquo; distribution companies to add nonfree software "
+#| "to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of "
+#| "convenience and power.  All the major commercial distribution developers "
+#| "do this; none limits itself to free software.  Most of them do not "
+#| "clearly identify the nonfree packages in their distributions.  Many even "
+#| "develop nonfree software and add it to the system.  Some outrageously "
+#| "advertise &ldquo;Linux&rdquo; systems that are &ldquo;licensed per "
+#| "seat&rdquo;, which give the user as much freedom as Microsoft Windows."
 msgid ""
 "A great challenge to the future of free software comes from the tendency of "
 "the &ldquo;Linux&rdquo; distribution companies to add nonfree software to <a "
@@ -154,7 +200,7 @@
 "limits itself to free software.  Most of them do not clearly identify the "
 "nonfree packages in their distributions.  Many even develop nonfree software "
 "and add it to the system.  Some outrageously advertise &ldquo;Linux&rdquo; "
-"systems that are &ldquo;licensed per seat&rdquo;, which give the user as "
+"systems that are &ldquo;licensed per seat,&rdquo; which give the user as "
 "much freedom as Microsoft Windows."
 msgstr ""
 "자유 소프트웨어의 미래에 대한 중대한 도전은 &ldquo;리눅
스&rdquo; 배포판 회사"
@@ -167,7 +213,29 @@
 "&ldquo;리눅스&rdquo; 시스템을 광고하기도 합니다. 이는 
마이크로소프트 윈도우"
 "와 아무 차이도 없습니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People try to justify adding nonfree software in the name of the
+# | &ldquo;popularity of Linux&rdquo;&mdash;in effect, valuing popularity
+# | above freedom.  Sometimes this is openly admitted.  For instance, Wired
+# | Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;feels
+# | that the move toward open source software should be fueled by technical,
+# | rather than political, decisions.&rdquo; And Caldera's <abbr title=\"Chief
+# | Executive Officer\">CEO</abbr> openly urged users to <a
+# | href=\"http{+s+}://www.zdnet.com/article/stallman-love-is-not-free/\">drop
+# | the goal of freedom and work instead for the &ldquo;popularity of
+# | Linux&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "People try to justify adding nonfree software in the name of the &ldquo;"
+#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
+#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
+#| "Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;"
+#| "feels that the move toward open source software should be fueled by "
+#| "technical, rather than political, decisions.&rdquo; And Caldera's <abbr "
+#| "title=\"Chief Executive Officer\">CEO</abbr> openly urged users to <a "
+#| "href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
+#| "goal of freedom and work instead for the &ldquo;popularity of Linux&rdquo;"
+#| "</a>."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -175,7 +243,7 @@
 "said that Robert McMillan, editor of Linux Magazine, &ldquo;feels that the "
 "move toward open source software should be fueled by technical, rather than "
 "political, decisions.&rdquo; And Caldera's <abbr title=\"Chief Executive "
-"Officer\">CEO</abbr> openly urged users to <a href=\"http://www.zdnet.com/";
+"Officer\">CEO</abbr> openly urged users to <a href=\"https://www.zdnet.com/";
 "article/stallman-love-is-not-free/\">drop the goal of freedom and work "
 "instead for the &ldquo;popularity of Linux&rdquo;</a>."
 msgstr ""
@@ -190,7 +258,7 @@
 "<a href=\"http://www.zdnet.com/article/stallman-love-is-not-free\";>(http://";
 "www.zdnet.com/article/stallman-love-is-not-free)</a>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -207,7 +275,7 @@
 "아들이고 자유라는 목적을 잊도록 암암리에 조장합니다. 
길을 따라갈 수 없다면 "
 "더 빨리 달려봐야 소용 없습니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, it "
 "can become a trap for free software developers.  When they write free "
@@ -228,7 +296,7 @@
 "자유 자바 구현체가 비슷한 효과를 갖고 있었지만, 
다행히도 <a href=\"/"
 "philosophy/java-trap.html\">자바의 함정</a>은 이제 대부분 
해결되었습니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -244,7 +312,7 @@
 "가 원하는 작업을 해나가지 못할 경지에 이르게 될 것입
니다. 이런 일이 일어나면 "
 "자유를 위한 우리의 운동이 실패할 것입니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -265,7 +333,7 @@
 "<strong>그것을 사용하는 비자유 프로그램을 거부하는 
것</strong> 외에는 특허받"
 "은 비밀 데이터 포맷과 싸우는 명확한 방법이 없다는 것을 
발견할 것입니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -281,7 +349,7 @@
 "를 순진하게 기대할 수 없습니다. 자유와 공동체를 위해 
싸우겠다는 결단, 몇 년"
 "이 걸려도 포기하지 않겠다는 결단이 필요합니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "In our community, this goal and this determination emanate mainly from the "
 "GNU Project.  We're the ones who talk about freedom and community as "
@@ -304,18 +372,38 @@
 "당 회사의 애플리케이션을 소개합니다. 우리 공동체의 
사람들이 자유와 결단의 아"
 "이디어를 떠올리는 주요한 곳은 GNU 프로젝트입니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid "But when people come across it, will they feel it relates to them?"
 msgstr "그러나 사람들이 그것을 떠올릴 때 그들이 그것과 
관련이 있다고 느낄까요?"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People who know they are using a system that came out of the GNU Project
+# | can see a direct relationship between themselves and GNU.  They won't
+# | automatically agree with our philosophy, but at least they will see a
+# | reason to think seriously about it.  In contrast, people who consider
+# | themselves &ldquo;Linux [-users&rdquo;,-] {+users,&rdquo;+} and believe
+# | that the GNU Project &ldquo;developed tools which proved to be useful in
+# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} typically perceive only an indirect
+# | relationship between GNU and themselves.  They may just ignore the GNU
+# | philosophy when they come across it.
+#, fuzzy
+#| msgid ""
+#| "People who know they are using a system that came out of the GNU Project "
+#| "can see a direct relationship between themselves and GNU.  They won't "
+#| "automatically agree with our philosophy, but at least they will see a "
+#| "reason to think seriously about it.  In contrast, people who consider "
+#| "themselves &ldquo;Linux users&rdquo;, and believe that the GNU Project "
+#| "&ldquo;developed tools which proved to be useful in Linux&rdquo;, "
+#| "typically perceive only an indirect relationship between GNU and "
+#| "themselves.  They may just ignore the GNU philosophy when they come "
+#| "across it."
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
 "automatically agree with our philosophy, but at least they will see a reason "
 "to think seriously about it.  In contrast, people who consider themselves "
-"&ldquo;Linux users&rdquo;, and believe that the GNU Project &ldquo;developed "
-"tools which proved to be useful in Linux&rdquo;, typically perceive only an "
+"&ldquo;Linux users,&rdquo; and believe that the GNU Project &ldquo;developed "
+"tools which proved to be useful in Linux,&rdquo; typically perceive only an "
 "indirect relationship between GNU and themselves.  They may just ignore the "
 "GNU philosophy when they come across it."
 msgstr ""
@@ -327,11 +415,26 @@
 "의 간접적인 관계만 인식하는 것이 보통입니다. 그런 
사람들은 GNU 철학을 발견하"
 "면 그냥 무시할지도 모릅니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project is idealistic, and anyone encouraging idealism today faces
+# | a great obstacle: the prevailing ideology encourages people to dismiss
+# | idealism as [-&ldquo;impractical&rdquo;.-] {+&ldquo;impractical.&rdquo;+}
+# | Our idealism has been extremely practical: it is the reason we have a free
+# | <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> operating system. 
+# | People who love this system ought to know that it is our idealism made
+# | real.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project is idealistic, and anyone encouraging idealism today "
+#| "faces a great obstacle: the prevailing ideology encourages people to "
+#| "dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been "
+#| "extremely practical: it is the reason we have a free <a href=\"/gnu/linux-"
+#| "and-gnu.html\">GNU/Linux</a> operating system.  People who love this "
+#| "system ought to know that it is our idealism made real."
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
-"idealism as &ldquo;impractical&rdquo;.  Our idealism has been extremely "
+"idealism as &ldquo;impractical.&rdquo; Our idealism has been extremely "
 "practical: it is the reason we have a free <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> operating system.  People who love this system ought to "
 "know that it is our idealism made real."
@@ -343,7 +446,7 @@
 "이 때문입니다. 이 시스템을 사랑하는 사람들은 그것이 
우리의 이상주의가 실현된 "
 "것임을 알아야 합니다."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If &ldquo;the job&rdquo; really were done, if there were nothing at stake "
 "except credit, perhaps it would be wiser to let the matter drop.  But we are "
@@ -359,6 +462,25 @@
 "href=\"/gnu/linux-and-gnu.html\">GNU/리눅스</a>라고 부르는 것으로 
우리를 도와"
 "주시기 바랍니다."
 
+#. type: Content of: <div><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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"이 글은 &lsquo;<a href=\"http://shop.fsf.org/product/free-software-free-";
+"society/\">자유 소프트웨어, 자유 사회: 리처드 M. 스톨먼 ì 
€ìž‘선집</a>&rsquo;"
+"에 포함되어 출판되었습니다."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -398,8 +520,12 @@
 "standards/README.translations.html\">번역 안내</a>를 참고해 
주세요."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+# | Copyright &copy; 2000, [-2006,-] 2007, [-2014-2016, 2020,-] 2021 Richard
+# | Stallman
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
 
@@ -426,3 +552,12 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "최종 수정일:"
+
+#~ 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>."
+#~ msgstr ""
+#~ "이 글은 &lsquo;<a 
href=\"http://shop.fsf.org/product/free-software-free-";
+#~ "society/\">자유 소프트웨어, 자유 사회: 리처드 M. 스톨먼 ì 
€ìž‘선집</"
+#~ "a>&rsquo;에 포함되어 출판되었습니다."

Index: gnu/po/why-gnu-linux.nl.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.nl.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- gnu/po/why-gnu-linux.nl.po  30 May 2021 20:26:36 -0000      1.27
+++ gnu/po/why-gnu-linux.nl.po  30 Aug 2021 13:34:55 -0000      1.28
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: why-gnu-linux.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Tom Uijldert <Tom.Uijldert@gmail.com>\n"
 "Language-Team: Dutch\n"
@@ -17,55 +17,48 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "X-Generator: Poedit 1.8.7.1\n"
 
 #. type: Content of: <title>
 msgid "Why GNU/Linux? - GNU Project - Free Software Foundation"
 msgstr "Waarom GNU/Linux? - GNU-project - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "What's in a Name?"
 msgstr "Als het beestje maar een naam heeft"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "door <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-# kleine verbeteringen
-# Toegevoegd: "dat de geschiedenis van het GNU/Linux-systeem beschrijft en hoe 
het aan de naam komt"
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
-"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>, which gives a history of the GNU/Linux "
-"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Meer informatie hierover is te vinden in onze <a href= \"/gnu/gnu-linux-faq."
-"html\">GNU/Linux veelgestelde vragen</a>, ons artikel over <a href=\"/gnu/"
-"linux-and-gnu.html\">Linux en het GNU-project</a> dat de geschiedenis van "
-"het GNU/Linux-systeem beschrijft en hoe het aan de naam komt, en ons artikel "
-"over <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU-gebruikers die "
-"nog nooit van GNU gehoord hebben</a>."
-
 #. type: Content of: <div><p>
-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>."
-msgstr ""
-"Dit verhaal is gepubliceerd in <a href=\"http://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Vrije software, vrije maatschappij: "
-"geselecteerde artikelen van Richard M. Stallman</cite></a>."
-
-#. type: Content of: <div><div><p>
+# | Names convey meanings; our choice of names determines the meaning of what
+# | we say.  An inappropriate name gives people the wrong idea.  A rose by any
+# | other name would smell as sweet&mdash;but if you call it a pen, people
+# | will be rather disappointed when they try to write with it.  And if you
+# | call pens [-&ldquo;roses&rdquo;,-] {+&ldquo;roses,&rdquo;+} people may not
+# | realize what they are good for.  If you call our operating system Linux,
+# | that conveys a mistaken idea of the system's origin, history, and purpose.
+# |  If you call it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that
+# | conveys (though not in detail) an accurate idea.
+#, fuzzy
+#| msgid ""
+#| "Names convey meanings; our choice of names determines the meaning of what "
+#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
+#| "any other name would smell as sweet&mdash;but if you call it a pen, "
+#| "people will be rather disappointed when they try to write with it.  And "
+#| "if you call pens &ldquo;roses&rdquo;, people may not realize what they "
+#| "are good for.  If you call our operating system Linux, that conveys a "
+#| "mistaken idea of the system's origin, history, and purpose.  If you call "
+#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
+#| "(though not in detail) an accurate idea."
 msgid ""
 "Names convey meanings; our choice of names determines the meaning of what we "
 "say.  An inappropriate name gives people the wrong idea.  A rose by any "
 "other name would smell as sweet&mdash;but if you call it a pen, people will "
 "be rather disappointed when they try to write with it.  And if you call pens "
-"&ldquo;roses&rdquo;, people may not realize what they are good for.  If you "
+"&ldquo;roses,&rdquo; people may not realize what they are good for.  If you "
 "call our operating system Linux, that conveys a mistaken idea of the "
 "system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
 "and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
@@ -81,7 +74,40 @@
 "systeem, zijn geschiedenis en het doel. De naam <a href=\"/gnu/linux-and-gnu."
 "html\">GNU/Linux</a> geeft de situatie al beter weer."
 
+# kleine verbeteringen
+# Toegevoegd: "dat de geschiedenis van het GNU/Linux-systeem beschrijft en hoe 
het aan de naam komt"
 #. type: Content of: <div><div><p>
+# | To learn more about this issue, you can read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
+# | {+System</a>,+} which gives a history of the GNU/Linux system as it
+# | relates to this issue of naming, and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+#| "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu."
+#| "html\">Linux and the GNU Project</a>, which gives a history of the GNU/"
+#| "Linux system as it relates to this issue of naming, and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>, which gives a history of the GNU/Linux "
+"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Meer informatie hierover is te vinden in onze <a href= \"/gnu/gnu-linux-faq."
+"html\">GNU/Linux veelgestelde vragen</a>, ons artikel over <a href=\"/gnu/"
+"linux-and-gnu.html\">Linux en het GNU-project</a> dat de geschiedenis van "
+"het GNU/Linux-systeem beschrijft en hoe het aan de naam komt, en ons artikel "
+"over <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU-gebruikers die "
+"nog nooit van GNU gehoord hebben</a>."
+
+#. type: Content of: <div><p>
 msgid ""
 "Does this really matter for our community? Is it important whether people "
 "know the system's origin, history, and purpose? Yes&mdash;because people who "
@@ -98,7 +124,7 @@
 "waren om GNU te ontwikkelen zijn nog niet volledig verdwenen en dreigen "
 "zelfs terug te komen."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
@@ -106,7 +132,7 @@
 "Wanneer ik uitleg waarom het belangrijk is het systeem GNU/Linux en niet "
 "&ldquo;Linux&rdquo; te noemen reageren mensen soms als volgt:"
 
-#. type: Content of: <div><div><blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "<em> Granted that the GNU Project deserves credit for this work, is it "
 "really worth a fuss when people don't give credit? Isn't the important thing "
@@ -119,7 +145,7 @@
 "toch, geniet van je mooie stukje werk en maak je niet druk over wie de eer "
 "toekomt.  </em>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "This would be wise advice, if only the situation were like that&mdash;if the "
 "job were done and it were time to relax.  If only that were true! But "
@@ -135,7 +161,7 @@
 "gebruik van de naam <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> helpt "
 "ons en anderen aan die doelen te herinneren."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "It is possible to write good free software without thinking of GNU; much "
 "good work has been done in the name of Linux also.  But the term &ldquo;"
@@ -151,7 +177,27 @@
 "in het zakenleven wordt gebruikt zullen we meer moeite hebben dit te "
 "verbinden met onze gemeenschapszin."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | A great challenge to the future of free software comes from the tendency
+# | of the &ldquo;Linux&rdquo; distribution companies to add nonfree software
+# | to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of
+# | convenience and power.  All the major commercial distribution developers
+# | do this; none limits itself to free software.  Most of them do not clearly
+# | identify the nonfree packages in their distributions.  Many even develop
+# | nonfree software and add it to the system.  Some outrageously advertise
+# | &ldquo;Linux&rdquo; systems that are &ldquo;licensed per [-seat&rdquo;,-]
+# | {+seat,&rdquo;+} which give the user as much freedom as Microsoft Windows.
+#, fuzzy
+#| msgid ""
+#| "A great challenge to the future of free software comes from the tendency "
+#| "of the &ldquo;Linux&rdquo; distribution companies to add nonfree software "
+#| "to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of "
+#| "convenience and power.  All the major commercial distribution developers "
+#| "do this; none limits itself to free software.  Most of them do not "
+#| "clearly identify the nonfree packages in their distributions.  Many even "
+#| "develop nonfree software and add it to the system.  Some outrageously "
+#| "advertise &ldquo;Linux&rdquo; systems that are &ldquo;licensed per "
+#| "seat&rdquo;, which give the user as much freedom as Microsoft Windows."
 msgid ""
 "A great challenge to the future of free software comes from the tendency of "
 "the &ldquo;Linux&rdquo; distribution companies to add nonfree software to <a "
@@ -160,7 +206,7 @@
 "limits itself to free software.  Most of them do not clearly identify the "
 "nonfree packages in their distributions.  Many even develop nonfree software "
 "and add it to the system.  Some outrageously advertise &ldquo;Linux&rdquo; "
-"systems that are &ldquo;licensed per seat&rdquo;, which give the user as "
+"systems that are &ldquo;licensed per seat,&rdquo; which give the user as "
 "much freedom as Microsoft Windows."
 msgstr ""
 "Een grote uitdaging in de nabije toekomst komt van de neiging van &ldquo;"
@@ -174,7 +220,29 @@
 "gebruiker&rdquo;, waarmee je net zoveel vrijheid krijgt als met Microsoft "
 "Windows."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People try to justify adding nonfree software in the name of the
+# | &ldquo;popularity of Linux&rdquo;&mdash;in effect, valuing popularity
+# | above freedom.  Sometimes this is openly admitted.  For instance, Wired
+# | Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;feels
+# | that the move toward open source software should be fueled by technical,
+# | rather than political, decisions.&rdquo; And Caldera's <abbr title=\"Chief
+# | Executive Officer\">CEO</abbr> openly urged users to <a
+# | href=\"http{+s+}://www.zdnet.com/article/stallman-love-is-not-free/\">drop
+# | the goal of freedom and work instead for the &ldquo;popularity of
+# | Linux&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "People try to justify adding nonfree software in the name of the &ldquo;"
+#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
+#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
+#| "Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;"
+#| "feels that the move toward open source software should be fueled by "
+#| "technical, rather than political, decisions.&rdquo; And Caldera's <abbr "
+#| "title=\"Chief Executive Officer\">CEO</abbr> openly urged users to <a "
+#| "href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
+#| "goal of freedom and work instead for the &ldquo;popularity of Linux&rdquo;"
+#| "</a>."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -182,7 +250,7 @@
 "said that Robert McMillan, editor of Linux Magazine, &ldquo;feels that the "
 "move toward open source software should be fueled by technical, rather than "
 "political, decisions.&rdquo; And Caldera's <abbr title=\"Chief Executive "
-"Officer\">CEO</abbr> openly urged users to <a href=\"http://www.zdnet.com/";
+"Officer\">CEO</abbr> openly urged users to <a href=\"https://www.zdnet.com/";
 "article/stallman-love-is-not-free/\">drop the goal of freedom and work "
 "instead for the &ldquo;popularity of Linux&rdquo;</a>."
 msgstr ""
@@ -198,7 +266,7 @@
 "in ruil voor de &ldquo;populariteit van Linux&rdquo;</a>."
 
 # aantal mensen dat een combinatie van GNU/Linux en niet-vrije software zal 
gebruiken
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -218,7 +286,7 @@
 
 # is nog steeds niet helemaal opgelost omdat LessTif nog een beetje moet 
worden opgepoetst (help hier alsjeblieft aan mee!) -> bleef bestaan totdat het 
niet meer gebruikt werd
 # heeft nu -> had later
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, it "
 "can become a trap for free software developers.  When they write free "
@@ -241,7 +309,7 @@
 "hetzelfde effect: de <a href =\"/philosophy/java-trap.html\">Java-valstrik</"
 "a> (merk op dat dit gelukkig grotendeels is opgelost)."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -259,7 +327,7 @@
 "mislukt zijn."
 
 # "(zie petition.eurolinux.org en onderteken die!)" verwijderd
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -283,7 +351,7 @@
 "patenten en geheime opslagformaten te bestrijden, behalve door <strong>te "
 "weigeren deze niet-vrije programma's te gebruiken</strong>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -303,7 +371,7 @@
 "vastberadenheid om jaren vol te houden en niet op te geven."
 
 # "die werken op GNU/Linux" toegevoegd
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "In our community, this goal and this determination emanate mainly from the "
 "GNU Project.  We're the ones who talk about freedom and community as "
@@ -330,20 +398,40 @@
 "gemeenschap in aanraking kunnen komen met het idee van vrijheid en "
 "vastberadenheid is in het GNU-project."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid "But when people come across it, will they feel it relates to them?"
 msgstr ""
 "Maar wanneer mensen hiermee in aanraking komen, zullen ze zich dan "
 "aangesproken voelen?"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People who know they are using a system that came out of the GNU Project
+# | can see a direct relationship between themselves and GNU.  They won't
+# | automatically agree with our philosophy, but at least they will see a
+# | reason to think seriously about it.  In contrast, people who consider
+# | themselves &ldquo;Linux [-users&rdquo;,-] {+users,&rdquo;+} and believe
+# | that the GNU Project &ldquo;developed tools which proved to be useful in
+# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} typically perceive only an indirect
+# | relationship between GNU and themselves.  They may just ignore the GNU
+# | philosophy when they come across it.
+#, fuzzy
+#| msgid ""
+#| "People who know they are using a system that came out of the GNU Project "
+#| "can see a direct relationship between themselves and GNU.  They won't "
+#| "automatically agree with our philosophy, but at least they will see a "
+#| "reason to think seriously about it.  In contrast, people who consider "
+#| "themselves &ldquo;Linux users&rdquo;, and believe that the GNU Project "
+#| "&ldquo;developed tools which proved to be useful in Linux&rdquo;, "
+#| "typically perceive only an indirect relationship between GNU and "
+#| "themselves.  They may just ignore the GNU philosophy when they come "
+#| "across it."
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
 "automatically agree with our philosophy, but at least they will see a reason "
 "to think seriously about it.  In contrast, people who consider themselves "
-"&ldquo;Linux users&rdquo;, and believe that the GNU Project &ldquo;developed "
-"tools which proved to be useful in Linux&rdquo;, typically perceive only an "
+"&ldquo;Linux users,&rdquo; and believe that the GNU Project &ldquo;developed "
+"tools which proved to be useful in Linux,&rdquo; typically perceive only an "
 "indirect relationship between GNU and themselves.  They may just ignore the "
 "GNU philosophy when they come across it."
 msgstr ""
@@ -357,11 +445,26 @@
 "en GNU. Ze zouden de GNU-filosofie weleens kunnen negeren wanneer ze ermee "
 "in aanraking zouden komen."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project is idealistic, and anyone encouraging idealism today faces
+# | a great obstacle: the prevailing ideology encourages people to dismiss
+# | idealism as [-&ldquo;impractical&rdquo;.-] {+&ldquo;impractical.&rdquo;+}
+# | Our idealism has been extremely practical: it is the reason we have a free
+# | <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> operating system. 
+# | People who love this system ought to know that it is our idealism made
+# | real.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project is idealistic, and anyone encouraging idealism today "
+#| "faces a great obstacle: the prevailing ideology encourages people to "
+#| "dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been "
+#| "extremely practical: it is the reason we have a free <a href=\"/gnu/linux-"
+#| "and-gnu.html\">GNU/Linux</a> operating system.  People who love this "
+#| "system ought to know that it is our idealism made real."
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
-"idealism as &ldquo;impractical&rdquo;.  Our idealism has been extremely "
+"idealism as &ldquo;impractical.&rdquo; Our idealism has been extremely "
 "practical: it is the reason we have a free <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> operating system.  People who love this system ought to "
 "know that it is our idealism made real."
@@ -374,7 +477,7 @@
 "het ons idealisme is geweest wat dit mogelijk heeft gemaakt."
 
 # zijn -> bevinden ons
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If &ldquo;the job&rdquo; really were done, if there were nothing at stake "
 "except credit, perhaps it would be wiser to let the matter drop.  But we are "
@@ -391,6 +494,25 @@
 "Help ons daarin door het besturingssysteem <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> te noemen."
 
+#. type: Content of: <div><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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Dit artikel is opgenomen 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>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -434,8 +556,12 @@
 "voor informatie over het onderhoud van vertalingen op deze website."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+# | Copyright &copy; 2000, [-2006,-] 2007, [-2014-2016, 2020,-] 2021 Richard
+# | Stallman
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
 
@@ -460,6 +586,15 @@
 msgstr "Bijgewerkt:"
 
 #~ 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>."
+#~ msgstr ""
+#~ "Dit verhaal is gepubliceerd in <a href=\"http://shop.fsf.org/product/free-";
+#~ "software-free-society/\"><cite>Vrije software, vrije maatschappij: "
+#~ "geselecteerde artikelen van Richard M. Stallman</cite></a>."
+
+#~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"
 #~ msgstr ""

Index: gnu/po/why-gnu-linux.pl.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.pl.po,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- gnu/po/why-gnu-linux.pl.po  20 Apr 2021 12:03:21 -0000      1.41
+++ gnu/po/why-gnu-linux.pl.po  30 Aug 2021 13:34:55 -0000      1.42
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: why-gnu-linux.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2016-03-20 20:34-0600\n"
 "Last-Translator: Jan Owoc <jsowoc AT gmail.com>\n"
 "Language-Team: Polish <www-pl-trans@gnu.org>\n"
@@ -15,6 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Virtaal 0.7.1\n"
@@ -23,47 +24,41 @@
 msgid "Why GNU/Linux? - GNU Project - Free Software Foundation"
 msgstr "Dlaczego GNU/Linux? - Projekt GNU - Free Software Foundation"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "What's in a Name?"
 msgstr "Czymże jest nazwa?"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
-"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>, which gives a history of the GNU/Linux "
-"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Aby&nbsp;dowiedzieć się więcej na&nbsp;ten temat możesz również 
przeczytać "
-"<a href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, stronę na&nbsp;temat "
-"<a href=\"/gnu/linux-and-gnu.html\">Linux i&nbsp;GNU Project</a>, która "
-"podaje historię systemu GNU/Linux jeśli chodzi o nazewnictwo, i&nbsp;naszą 
"
-"stonę o <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">Użytkownikach "
-"GNU, którzy nigdy nie słyszeli o GNU</a>."
-
 #. type: Content of: <div><p>
-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>."
-msgstr ""
-"Ten esej jest opublikowany w&nbsp;<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>."
-
-#. type: Content of: <div><div><p>
+# | Names convey meanings; our choice of names determines the meaning of what
+# | we say.  An inappropriate name gives people the wrong idea.  A rose by any
+# | other name would smell as sweet&mdash;but if you call it a pen, people
+# | will be rather disappointed when they try to write with it.  And if you
+# | call pens [-&ldquo;roses&rdquo;,-] {+&ldquo;roses,&rdquo;+} people may not
+# | realize what they are good for.  If you call our operating system Linux,
+# | that conveys a mistaken idea of the system's origin, history, and purpose.
+# |  If you call it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that
+# | conveys (though not in detail) an accurate idea.
+#, fuzzy
+#| msgid ""
+#| "Names convey meanings; our choice of names determines the meaning of what "
+#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
+#| "any other name would smell as sweet&mdash;but if you call it a pen, "
+#| "people will be rather disappointed when they try to write with it.  And "
+#| "if you call pens &ldquo;roses&rdquo;, people may not realize what they "
+#| "are good for.  If you call our operating system Linux, that conveys a "
+#| "mistaken idea of the system's origin, history, and purpose.  If you call "
+#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
+#| "(though not in detail) an accurate idea."
 msgid ""
 "Names convey meanings; our choice of names determines the meaning of what we "
 "say.  An inappropriate name gives people the wrong idea.  A rose by any "
 "other name would smell as sweet&mdash;but if you call it a pen, people will "
 "be rather disappointed when they try to write with it.  And if you call pens "
-"&ldquo;roses&rdquo;, people may not realize what they are good for.  If you "
+"&ldquo;roses,&rdquo; people may not realize what they are good for.  If you "
 "call our operating system Linux, that conveys a mistaken idea of the "
 "system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
 "and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
@@ -81,6 +76,37 @@
 "sobie właściwe, choć&nbsp;niezbyt dokładne, pojęcie."
 
 #. type: Content of: <div><div><p>
+# | To learn more about this issue, you can read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
+# | {+System</a>,+} which gives a history of the GNU/Linux system as it
+# | relates to this issue of naming, and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+#| "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu."
+#| "html\">Linux and the GNU Project</a>, which gives a history of the GNU/"
+#| "Linux system as it relates to this issue of naming, and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>, which gives a history of the GNU/Linux "
+"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Aby&nbsp;dowiedzieć się więcej na&nbsp;ten temat możesz również 
przeczytać "
+"<a href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, stronę na&nbsp;temat "
+"<a href=\"/gnu/linux-and-gnu.html\">Linux i&nbsp;GNU Project</a>, która "
+"podaje historię systemu GNU/Linux jeśli chodzi o nazewnictwo, i&nbsp;naszą 
"
+"stonę o <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">Użytkownikach "
+"GNU, którzy nigdy nie słyszeli o GNU</a>."
+
+#. type: Content of: <div><p>
 msgid ""
 "Does this really matter for our community? Is it important whether people "
 "know the system's origin, history, and purpose? Yes&mdash;because people who "
@@ -97,7 +123,7 @@
 "do&nbsp;stworzenia GNU nie zostały wykorzenione i&nbsp;grozi nam, że&nbsp;"
 "powrócą."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
@@ -105,7 +131,7 @@
 "Kiedy wyjaśniam, dlaczego właściwym jest nazywanie systemu &bdquo;GNU/"
 "Linux&rdquo;, a&nbsp;nie &bdquo;Linux&rdquo;, czasami ludzie odpowiadają 
tak:"
 
-#. type: Content of: <div><div><blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "<em> Granted that the GNU Project deserves credit for this work, is it "
 "really worth a fuss when people don't give credit? Isn't the important thing "
@@ -119,7 +145,7 @@
 "Lepiej odpoczywajcie, napawajcie się dumą z&nbsp;dobrze wykonanej roboty "
 "i&nbsp;nie przejmujcie się uznaniem.</em>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "This would be wise advice, if only the situation were like that&mdash;if the "
 "job were done and it were time to relax.  If only that were true! But "
@@ -136,7 +162,7 @@
 "gnu/linux-and-gnu.html\">GNU/Linux</a> to sposób na&nbsp;przypominanie sobie 
"
 "o&nbsp;tych celach i&nbsp;informowanie o&nbsp;nich innych."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "It is possible to write good free software without thinking of GNU; much "
 "good work has been done in the name of Linux also.  But the term &ldquo;"
@@ -153,7 +179,27 @@
 "tę nazwę, będzie nam jeszcze trudniej wiązać ją z&nbsp;duchem naszej "
 "społeczności."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | A great challenge to the future of free software comes from the tendency
+# | of the &ldquo;Linux&rdquo; distribution companies to add nonfree software
+# | to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of
+# | convenience and power.  All the major commercial distribution developers
+# | do this; none limits itself to free software.  Most of them do not clearly
+# | identify the nonfree packages in their distributions.  Many even develop
+# | nonfree software and add it to the system.  Some outrageously advertise
+# | &ldquo;Linux&rdquo; systems that are &ldquo;licensed per [-seat&rdquo;,-]
+# | {+seat,&rdquo;+} which give the user as much freedom as Microsoft Windows.
+#, fuzzy
+#| msgid ""
+#| "A great challenge to the future of free software comes from the tendency "
+#| "of the &ldquo;Linux&rdquo; distribution companies to add nonfree software "
+#| "to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of "
+#| "convenience and power.  All the major commercial distribution developers "
+#| "do this; none limits itself to free software.  Most of them do not "
+#| "clearly identify the nonfree packages in their distributions.  Many even "
+#| "develop nonfree software and add it to the system.  Some outrageously "
+#| "advertise &ldquo;Linux&rdquo; systems that are &ldquo;licensed per "
+#| "seat&rdquo;, which give the user as much freedom as Microsoft Windows."
 msgid ""
 "A great challenge to the future of free software comes from the tendency of "
 "the &ldquo;Linux&rdquo; distribution companies to add nonfree software to <a "
@@ -162,7 +208,7 @@
 "limits itself to free software.  Most of them do not clearly identify the "
 "nonfree packages in their distributions.  Many even develop nonfree software "
 "and add it to the system.  Some outrageously advertise &ldquo;Linux&rdquo; "
-"systems that are &ldquo;licensed per seat&rdquo;, which give the user as "
+"systems that are &ldquo;licensed per seat,&rdquo; which give the user as "
 "much freedom as Microsoft Windows."
 msgstr ""
 "Wielkim wyzwaniem dla przyszłości wolnego oprogramowanie stała się 
tendencja "
@@ -177,7 +223,29 @@
 "Linux&rdquo;, które są &bdquo;licencjonowane od&nbsp;stanowiska&rdquo;, "
 "dając użytkownikowi tyle samo wolności, co Microsoft Windows."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People try to justify adding nonfree software in the name of the
+# | &ldquo;popularity of Linux&rdquo;&mdash;in effect, valuing popularity
+# | above freedom.  Sometimes this is openly admitted.  For instance, Wired
+# | Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;feels
+# | that the move toward open source software should be fueled by technical,
+# | rather than political, decisions.&rdquo; And Caldera's <abbr title=\"Chief
+# | Executive Officer\">CEO</abbr> openly urged users to <a
+# | href=\"http{+s+}://www.zdnet.com/article/stallman-love-is-not-free/\">drop
+# | the goal of freedom and work instead for the &ldquo;popularity of
+# | Linux&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "People try to justify adding nonfree software in the name of the &ldquo;"
+#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
+#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
+#| "Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;"
+#| "feels that the move toward open source software should be fueled by "
+#| "technical, rather than political, decisions.&rdquo; And Caldera's <abbr "
+#| "title=\"Chief Executive Officer\">CEO</abbr> openly urged users to <a "
+#| "href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
+#| "goal of freedom and work instead for the &ldquo;popularity of Linux&rdquo;"
+#| "</a>."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -185,7 +253,7 @@
 "said that Robert McMillan, editor of Linux Magazine, &ldquo;feels that the "
 "move toward open source software should be fueled by technical, rather than "
 "political, decisions.&rdquo; And Caldera's <abbr title=\"Chief Executive "
-"Officer\">CEO</abbr> openly urged users to <a href=\"http://www.zdnet.com/";
+"Officer\">CEO</abbr> openly urged users to <a href=\"https://www.zdnet.com/";
 "article/stallman-love-is-not-free/\">drop the goal of freedom and work "
 "instead for the &ldquo;popularity of Linux&rdquo;</a>."
 msgstr ""
@@ -200,7 +268,7 @@
 "not-free/\">do&nbsp;porzucenia wolności jako celu i&nbsp;zastąpienia jej "
 "pracą na&nbsp;rzecz &bdquo;popularności Linuksa&rdquo;</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -219,7 +287,7 @@
 "zapominania o&nbsp;celu&nbsp;&ndash; wolności. Nie ma sensu jechać 
szybciej, "
 "jeśli nie można utrzymać się na&nbsp;drodze."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, it "
 "can become a trap for free software developers.  When they write free "
@@ -243,7 +311,7 @@
 "miała podobne skutki: tworzyła <a href=\"/philosophy/java-trap.html"
 "\">Pułapkę Javy</a>, na&nbsp;szczęście w&nbsp;większości już 
naprawioną."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -261,7 +329,7 @@
 "spodziewają się zastać razem z&nbsp;nim. Jeśli tak się stanie, nasza "
 "kampania o&nbsp;wolność skończy się niepowodzeniem."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -286,7 +354,7 @@
 "danych oprócz <strong>odrzucenia niewolnych programów, które ich używają
</"
 "strong>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -306,7 +374,7 @@
 "swojej społeczności, determinacji, żeby działać przez lata i&nbsp;nie "
 "poddawać się."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "In our community, this goal and this determination emanate mainly from the "
 "GNU Project.  We're the ones who talk about freedom and community as "
@@ -333,19 +401,39 @@
 "mogą najprędzej zetknąć się z&nbsp;ideą wolności i&nbsp;determinacji 
jest "
 "Projekt GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid "But when people come across it, will they feel it relates to them?"
 msgstr ""
 "Lecz&nbsp;kiedy się z&nbsp;nią zetkną, czy&nbsp;pomyślą, że&nbsp;ich 
dotyczy?"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People who know they are using a system that came out of the GNU Project
+# | can see a direct relationship between themselves and GNU.  They won't
+# | automatically agree with our philosophy, but at least they will see a
+# | reason to think seriously about it.  In contrast, people who consider
+# | themselves &ldquo;Linux [-users&rdquo;,-] {+users,&rdquo;+} and believe
+# | that the GNU Project &ldquo;developed tools which proved to be useful in
+# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} typically perceive only an indirect
+# | relationship between GNU and themselves.  They may just ignore the GNU
+# | philosophy when they come across it.
+#, fuzzy
+#| msgid ""
+#| "People who know they are using a system that came out of the GNU Project "
+#| "can see a direct relationship between themselves and GNU.  They won't "
+#| "automatically agree with our philosophy, but at least they will see a "
+#| "reason to think seriously about it.  In contrast, people who consider "
+#| "themselves &ldquo;Linux users&rdquo;, and believe that the GNU Project "
+#| "&ldquo;developed tools which proved to be useful in Linux&rdquo;, "
+#| "typically perceive only an indirect relationship between GNU and "
+#| "themselves.  They may just ignore the GNU philosophy when they come "
+#| "across it."
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
 "automatically agree with our philosophy, but at least they will see a reason "
 "to think seriously about it.  In contrast, people who consider themselves "
-"&ldquo;Linux users&rdquo;, and believe that the GNU Project &ldquo;developed "
-"tools which proved to be useful in Linux&rdquo;, typically perceive only an "
+"&ldquo;Linux users,&rdquo; and believe that the GNU Project &ldquo;developed "
+"tools which proved to be useful in Linux,&rdquo; typically perceive only an "
 "indirect relationship between GNU and themselves.  They may just ignore the "
 "GNU philosophy when they come across it."
 msgstr ""
@@ -359,11 +447,26 @@
 "w&nbsp;większości dostrzegają tylko pośredni związek między GNU 
a&nbsp;sobą. "
 "Kiedy zetkną się z&nbsp;ideami GNU, mogą je zwyczajnie ignorować."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project is idealistic, and anyone encouraging idealism today faces
+# | a great obstacle: the prevailing ideology encourages people to dismiss
+# | idealism as [-&ldquo;impractical&rdquo;.-] {+&ldquo;impractical.&rdquo;+}
+# | Our idealism has been extremely practical: it is the reason we have a free
+# | <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> operating system. 
+# | People who love this system ought to know that it is our idealism made
+# | real.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project is idealistic, and anyone encouraging idealism today "
+#| "faces a great obstacle: the prevailing ideology encourages people to "
+#| "dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been "
+#| "extremely practical: it is the reason we have a free <a href=\"/gnu/linux-"
+#| "and-gnu.html\">GNU/Linux</a> operating system.  People who love this "
+#| "system ought to know that it is our idealism made real."
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
-"idealism as &ldquo;impractical&rdquo;.  Our idealism has been extremely "
+"idealism as &ldquo;impractical.&rdquo; Our idealism has been extremely "
 "practical: it is the reason we have a free <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> operating system.  People who love this system ought to "
 "know that it is our idealism made real."
@@ -376,7 +479,7 @@
 "Linux</a>. Ludzie, którzy kochają ten system, powinni wiedzieć, 
że&nbsp;to "
 "za&nbsp;sprawą naszego idealizmu stał się rzeczywistością."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If &ldquo;the job&rdquo; really were done, if there were nothing at stake "
 "except credit, perhaps it would be wiser to let the matter drop.  But we are "
@@ -392,6 +495,25 @@
 "zrobiliśmy. Prosimy, pomóżcie nam w&nbsp;tym, nazywając system <a 
href=\"/"
 "gnu/linux-and-gnu.html\">GNU/Linux</a>."
 
+#. type: Content of: <div><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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Ten esej jest opublikowany w&nbsp;<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>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -439,8 +561,12 @@
 "tłumaczeń</a>."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+# | Copyright &copy; 2000, [-2006,-] 2007, [-2014-2016, 2020,-] 2021 Richard
+# | Stallman
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
 
@@ -468,6 +594,15 @@
 msgstr "Aktualizowane:"
 
 #~ 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>."
+#~ msgstr ""
+#~ "Ten esej jest opublikowany w&nbsp;<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 ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"
 #~ msgstr ""

Index: gnu/po/why-gnu-linux.pot
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.pot,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- gnu/po/why-gnu-linux.pot    7 Apr 2021 18:04:13 -0000       1.28
+++ gnu/po/why-gnu-linux.pot    30 Aug 2021 13:34:55 -0000      1.29
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: why-gnu-linux.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,39 +20,21 @@
 msgid "Why GNU/Linux? - GNU Project - Free Software Foundation"
 msgstr ""
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "What's in a Name?"
 msgstr ""
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr ""
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can read our <a "
-"href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a "
-"href=\"/gnu/linux-and-gnu.html\">Linux and the GNU Project</a>, which gives "
-"a history of the GNU/Linux system as it relates to this issue of naming, and "
-"our page on <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who "
-"Have Never Heard of GNU</a>."
-msgstr ""
-
 #. type: Content of: <div><p>
 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>."
-msgstr ""
-
-#. type: Content of: <div><div><p>
-msgid ""
 "Names convey meanings; our choice of names determines the meaning of what we "
 "say.  An inappropriate name gives people the wrong idea.  A rose by any "
 "other name would smell as sweet&mdash;but if you call it a pen, people will "
 "be rather disappointed when they try to write with it.  And if you call pens "
-"&ldquo;roses&rdquo;, people may not realize what they are good for.  If you "
+"&ldquo;roses,&rdquo; people may not realize what they are good for.  If you "
 "call our operating system Linux, that conveys a mistaken idea of the "
 "system's origin, history, and purpose.  If you call it <a "
 "href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys (though not in "
@@ -61,6 +43,16 @@
 
 #. type: Content of: <div><div><p>
 msgid ""
+"To learn more about this issue, you can read our <a "
+"href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a "
+"href=\"/gnu/linux-and-gnu.html\">Linux and the GNU System</a>, which gives a "
+"history of the GNU/Linux system as it relates to this issue of naming, and "
+"our page on <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who "
+"Have Never Heard of GNU</a>."
+msgstr ""
+
+#. type: Content of: <div><p>
+msgid ""
 "Does this really matter for our community? Is it important whether people "
 "know the system's origin, history, and purpose? Yes&mdash;because people who "
 "forget history are often condemned to repeat it.  The Free World that has "
@@ -69,13 +61,13 @@
 "completely eradicated, and they threaten to come back."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
 msgstr ""
 
-#. type: Content of: <div><div><blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "<em> Granted that the GNU Project deserves credit for this work, is it "
 "really worth a fuss when people don't give credit? Isn't the important thing "
@@ -83,7 +75,7 @@
 "job well done, and not worry about the credit.  </em>"
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "This would be wise advice, if only the situation were like that&mdash;if the "
 "job were done and it were time to relax.  If only that were true! But "
@@ -93,7 +85,7 @@
 "people to remind themselves and inform others of these goals."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "It is possible to write good free software without thinking of GNU; much "
 "good work has been done in the name of Linux also.  But the term "
@@ -103,7 +95,7 @@
 "making it connect with community spirit."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "A great challenge to the future of free software comes from the tendency of "
 "the &ldquo;Linux&rdquo; distribution companies to add nonfree software to <a "
@@ -112,11 +104,11 @@
 "limits itself to free software.  Most of them do not clearly identify the "
 "nonfree packages in their distributions.  Many even develop nonfree software "
 "and add it to the system.  Some outrageously advertise &ldquo;Linux&rdquo; "
-"systems that are &ldquo;licensed per seat&rdquo;, which give the user as "
+"systems that are &ldquo;licensed per seat,&rdquo; which give the user as "
 "much freedom as Microsoft Windows."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People try to justify adding nonfree software in the name of the "
 "&ldquo;popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -125,12 +117,12 @@
 "move toward open source software should be fueled by technical, rather than "
 "political, decisions.&rdquo; And Caldera's <abbr title=\"Chief Executive "
 "Officer\">CEO</abbr> openly urged users to <a "
-"href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
+"href=\"https://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
 "goal of freedom and work instead for the &ldquo;popularity of "
 "Linux&rdquo;</a>."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Adding nonfree software to the <a "
 "href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> system may increase the "
@@ -141,7 +133,7 @@
 "is not good to drive faster if you can't stay on the road."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, it "
 "can become a trap for free software developers.  When they write free "
@@ -154,7 +146,7 @@
 "fortunately now mostly corrected."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -164,7 +156,7 @@
 "happens, our campaign for freedom will have failed."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -177,7 +169,7 @@
 "<strong>reject the nonfree programs that use them</strong>."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -188,7 +180,7 @@
 "give up."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "In our community, this goal and this determination emanate mainly from the "
 "GNU Project.  We're the ones who talk about freedom and community as "
@@ -203,33 +195,33 @@
 "determination is in the GNU Project."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid "But when people come across it, will they feel it relates to them?"
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
 "automatically agree with our philosophy, but at least they will see a reason "
 "to think seriously about it.  In contrast, people who consider themselves "
-"&ldquo;Linux users&rdquo;, and believe that the GNU Project &ldquo;developed "
-"tools which proved to be useful in Linux&rdquo;, typically perceive only an "
+"&ldquo;Linux users,&rdquo; and believe that the GNU Project &ldquo;developed "
+"tools which proved to be useful in Linux,&rdquo; typically perceive only an "
 "indirect relationship between GNU and themselves.  They may just ignore the "
 "GNU philosophy when they come across it."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
-"idealism as &ldquo;impractical&rdquo;.  Our idealism has been extremely "
+"idealism as &ldquo;impractical.&rdquo; Our idealism has been extremely "
 "practical: it is the reason we have a free <a "
 "href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> operating system.  People who "
 "love this system ought to know that it is our idealism made real."
 msgstr ""
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If &ldquo;the job&rdquo; really were done, if there were nothing at stake "
 "except credit, perhaps it would be wiser to let the matter drop.  But we are "
@@ -239,6 +231,14 @@
 "href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>."
 msgstr ""
 
+#. type: Content of: <div><div><p>
+msgid ""
+"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 ""
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -276,7 +276,7 @@
 msgstr ""
 
 #. type: Content of: <div><p>
-msgid "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard 
Stallman"
+msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
 msgstr ""
 
 #. type: Content of: <div><p>

Index: gnu/po/why-gnu-linux.pt-br.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.pt-br.po,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- gnu/po/why-gnu-linux.pt-br.po       20 Apr 2021 09:00:18 -0000      1.37
+++ gnu/po/why-gnu-linux.pt-br.po       30 Aug 2021 13:34:55 -0000      1.38
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: why-gnu-linux.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-04-20 05:22-0300\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <www-pt-br-general@gnu.org>\n"
@@ -21,6 +21,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "X-Generator: Gtranslator 40.0\n"
 
@@ -31,47 +32,32 @@
 # ‘What's in a name’ é uma citação de Shakespare. Aparentemente, ‘que 
há num
 # nome’ é tradução frequentemente usada em português.
 # 
(http://www.proz.com/kudoz/english_to_portuguese/advertising_public_relations/1785942-whats_in_a_name.html)
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "What's in a Name?"
 msgstr "Que há num nome?"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "por <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
-"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>, which gives a history of the GNU/Linux "
-"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Para aprender mais sobre essa questão, você pode ler nossas <a href=\"/gnu/"
-"gnu-linux-faq.html\">Perguntas mais Frequentes sobre GNU/Linux</a>, nossa "
-"página sobre <a href=\"/gnu/linux-and-gnu.html\">o Linux e o projeto GNU</"
-"a>, que conta a história do sistema GNU/Linux e se relaciona a essa questão 
"
-"de nomenclatura, e nossa página sobre <a href=\"/gnu/gnu-users-never-heard-"
-"of-gnu.html\">Usuários do GNU que Nunca Ouviram Falar sobre o GNU</a>."
-
 #. type: Content of: <div><p>
-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>."
-msgstr ""
-"Este ensaio foi publicado em <a href=\"http://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Software Livre, Sociedade Livre: Artigos "
-"selecionados de Richard M. Stallman</cite></a>."
-
-#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Names convey meanings; our choice of names determines the meaning of what "
+#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
+#| "any other name would smell as sweet&mdash;but if you call it a pen, "
+#| "people will be rather disappointed when they try to write with it.  And "
+#| "if you call pens &ldquo;roses&rdquo;, people may not realize what they "
+#| "are good for.  If you call our operating system Linux, that conveys a "
+#| "mistaken idea of the system's origin, history, and purpose.  If you call "
+#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
+#| "(though not in detail) an accurate idea."
 msgid ""
 "Names convey meanings; our choice of names determines the meaning of what we "
 "say.  An inappropriate name gives people the wrong idea.  A rose by any "
 "other name would smell as sweet&mdash;but if you call it a pen, people will "
 "be rather disappointed when they try to write with it.  And if you call pens "
-"&ldquo;roses&rdquo;, people may not realize what they are good for.  If you "
+"&ldquo;roses,&rdquo; people may not realize what they are good for.  If you "
 "call our operating system Linux, that conveys a mistaken idea of the "
 "system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
 "and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
@@ -88,6 +74,30 @@
 "passará uma ideia correta (mesmo que não em detalhes)."
 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+#| "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu."
+#| "html\">Linux and the GNU Project</a>, which gives a history of the GNU/"
+#| "Linux system as it relates to this issue of naming, and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>, which gives a history of the GNU/Linux "
+"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Para aprender mais sobre essa questão, você pode ler nossas <a href=\"/gnu/"
+"gnu-linux-faq.html\">Perguntas mais Frequentes sobre GNU/Linux</a>, nossa "
+"página sobre <a href=\"/gnu/linux-and-gnu.html\">o Linux e o projeto GNU</"
+"a>, que conta a história do sistema GNU/Linux e se relaciona a essa questão 
"
+"de nomenclatura, e nossa página sobre <a href=\"/gnu/gnu-users-never-heard-"
+"of-gnu.html\">Usuários do GNU que Nunca Ouviram Falar sobre o GNU</a>."
+
+#. type: Content of: <div><p>
 msgid ""
 "Does this really matter for our community? Is it important whether people "
 "know the system's origin, history, and purpose? Yes&mdash;because people who "
@@ -104,7 +114,7 @@
 "levaram a desenvolver o GNU não está completamente erradicados, e ameaçam "
 "retornar."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
@@ -112,7 +122,7 @@
 "Quando eu explico porque é inapropriado chamar o sistema operacional GNU/"
 "Linux ao invés de Linux, as pessoas às vezes respondem dessa maneira:"
 
-#. type: Content of: <div><div><blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "<em> Granted that the GNU Project deserves credit for this work, is it "
 "really worth a fuss when people don't give credit? Isn't the important thing "
@@ -124,7 +134,7 @@
 "é que o trabalho está feito, e não quem o fez? Vocês deveriam relaxar e 
se "
 "orgulhar do trabalho bem feito e não se preocupar com os créditos.</em>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "This would be wise advice, if only the situation were like that&mdash;if the "
 "job were done and it were time to relax.  If only that were true! But "
@@ -141,7 +151,7 @@
 "html\">GNU/Linux</a> é um modo de lembrar às pessoas e informar a outras "
 "desses objetivos."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "It is possible to write good free software without thinking of GNU; much "
 "good work has been done in the name of Linux also.  But the term &ldquo;"
@@ -158,7 +168,18 @@
 "comunidade."
 
 # Power: força? Poder? Licensed per seat?
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "A great challenge to the future of free software comes from the tendency "
+#| "of the &ldquo;Linux&rdquo; distribution companies to add nonfree software "
+#| "to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of "
+#| "convenience and power.  All the major commercial distribution developers "
+#| "do this; none limits itself to free software.  Most of them do not "
+#| "clearly identify the nonfree packages in their distributions.  Many even "
+#| "develop nonfree software and add it to the system.  Some outrageously "
+#| "advertise &ldquo;Linux&rdquo; systems that are &ldquo;licensed per "
+#| "seat&rdquo;, which give the user as much freedom as Microsoft Windows."
 msgid ""
 "A great challenge to the future of free software comes from the tendency of "
 "the &ldquo;Linux&rdquo; distribution companies to add nonfree software to <a "
@@ -167,7 +188,7 @@
 "limits itself to free software.  Most of them do not clearly identify the "
 "nonfree packages in their distributions.  Many even develop nonfree software "
 "and add it to the system.  Some outrageously advertise &ldquo;Linux&rdquo; "
-"systems that are &ldquo;licensed per seat&rdquo;, which give the user as "
+"systems that are &ldquo;licensed per seat,&rdquo; which give the user as "
 "much freedom as Microsoft Windows."
 msgstr ""
 "Um grande desafio para o futuro do software livre vem com a tendência das "
@@ -180,7 +201,19 @@
 "anunciam escandalosamente sistemas “Linux” que são licenciados "
 "individualmente, dando ao usuário tanta liberdade quanto o Microsoft 
Windows."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "People try to justify adding nonfree software in the name of the &ldquo;"
+#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
+#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
+#| "Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;"
+#| "feels that the move toward open source software should be fueled by "
+#| "technical, rather than political, decisions.&rdquo; And Caldera's <abbr "
+#| "title=\"Chief Executive Officer\">CEO</abbr> openly urged users to <a "
+#| "href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
+#| "goal of freedom and work instead for the &ldquo;popularity of Linux&rdquo;"
+#| "</a>."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -188,7 +221,7 @@
 "said that Robert McMillan, editor of Linux Magazine, &ldquo;feels that the "
 "move toward open source software should be fueled by technical, rather than "
 "political, decisions.&rdquo; And Caldera's <abbr title=\"Chief Executive "
-"Officer\">CEO</abbr> openly urged users to <a href=\"http://www.zdnet.com/";
+"Officer\">CEO</abbr> openly urged users to <a href=\"https://www.zdnet.com/";
 "article/stallman-love-is-not-free/\">drop the goal of freedom and work "
 "instead for the &ldquo;popularity of Linux&rdquo;</a>."
 msgstr ""
@@ -202,7 +235,7 @@
 "zdnet.com/article/stallman-love-is-not-free/\">abandonar o objetivo da "
 "liberdade e trabalhar na “popularidade do Linux”</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -220,7 +253,7 @@
 "uma coisa boa, e a esquecer a meta de liberdade. Não há propósito em ir 
mais "
 "rápido se não formos capazes de nos manter no caminho."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, it "
 "can become a trap for free software developers.  When they write free "
@@ -243,7 +276,7 @@
 "teve um efeito parecido: a <a href=\"/philosophy/java-trap.html\">Armadilha "
 "do Java</a>, felizmente hoje na maior parte corrigida."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -260,7 +293,7 @@
 "encontrar junto. Se isso acontecer, nossa campanha pela liberdade terá "
 "falhado."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -284,7 +317,7 @@
 "secretos e patenteados exceto por <strong>rejeitar os programas não livres "
 "que os utilizam</strong>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -303,7 +336,7 @@
 "liberdade e pela sua comunidade — determinação de lutar por anos a fio e 
não "
 "desistir."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "In our community, this goal and this determination emanate mainly from the "
 "GNU Project.  We're the ones who talk about freedom and community as "
@@ -328,20 +361,31 @@
 "comunidade onde as pessoas podem encontrar a ideia de liberdade e "
 "determinação é no Projeto GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid "But when people come across it, will they feel it relates to them?"
 msgstr ""
 "Mas quando as pessoas encontrarem essa ideia, elas irão sentir que isso tem "
 "a ver com elas?"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "People who know they are using a system that came out of the GNU Project "
+#| "can see a direct relationship between themselves and GNU.  They won't "
+#| "automatically agree with our philosophy, but at least they will see a "
+#| "reason to think seriously about it.  In contrast, people who consider "
+#| "themselves &ldquo;Linux users&rdquo;, and believe that the GNU Project "
+#| "&ldquo;developed tools which proved to be useful in Linux&rdquo;, "
+#| "typically perceive only an indirect relationship between GNU and "
+#| "themselves.  They may just ignore the GNU philosophy when they come "
+#| "across it."
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
 "automatically agree with our philosophy, but at least they will see a reason "
 "to think seriously about it.  In contrast, people who consider themselves "
-"&ldquo;Linux users&rdquo;, and believe that the GNU Project &ldquo;developed "
-"tools which proved to be useful in Linux&rdquo;, typically perceive only an "
+"&ldquo;Linux users,&rdquo; and believe that the GNU Project &ldquo;developed "
+"tools which proved to be useful in Linux,&rdquo; typically perceive only an "
 "indirect relationship between GNU and themselves.  They may just ignore the "
 "GNU philosophy when they come across it."
 msgstr ""
@@ -354,11 +398,19 @@
 "enxergar apenas uma relação indireta entre elas e o GNU. Elas podem "
 "simplesmente ignorar a filosofia do GNU quando elas a encontrarem."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Project is idealistic, and anyone encouraging idealism today "
+#| "faces a great obstacle: the prevailing ideology encourages people to "
+#| "dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been "
+#| "extremely practical: it is the reason we have a free <a href=\"/gnu/linux-"
+#| "and-gnu.html\">GNU/Linux</a> operating system.  People who love this "
+#| "system ought to know that it is our idealism made real."
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
-"idealism as &ldquo;impractical&rdquo;.  Our idealism has been extremely "
+"idealism as &ldquo;impractical.&rdquo; Our idealism has been extremely "
 "practical: it is the reason we have a free <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> operating system.  People who love this system ought to "
 "know that it is our idealism made real."
@@ -371,7 +423,7 @@
 "pessoas que amam esse sistema devem saber que ele é nosso idealismo tornado "
 "realidade."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If &ldquo;the job&rdquo; really were done, if there were nothing at stake "
 "except credit, perhaps it would be wiser to let the matter drop.  But we are "
@@ -387,6 +439,21 @@
 "ajude, chamando o sistema de <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</"
 "a>."
 
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "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>."
+msgid ""
+"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 ""
+"Este ensaio foi publicado em <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>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -432,8 +499,10 @@
 "contribuição com traduções das páginas deste site."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
 
@@ -465,6 +534,15 @@
 msgstr "Última atualização:"
 
 #~ 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>."
+#~ msgstr ""
+#~ "Este ensaio foi publicado em <a href=\"http://shop.fsf.org/product/free-";
+#~ "software-free-society/\"><cite>Software Livre, Sociedade Livre: Artigos "
+#~ "selecionados de Richard M. Stallman</cite></a>."
+
+#~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"
 #~ msgstr ""

Index: gnu/po/why-gnu-linux.ro.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.ro.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gnu/po/why-gnu-linux.ro.po  31 May 2021 09:06:18 -0000      1.9
+++ gnu/po/why-gnu-linux.ro.po  30 Aug 2021 13:34:55 -0000      1.10
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: why-gnu-linux.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+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"
@@ -23,12 +23,12 @@
 msgid "Why GNU/Linux? - GNU Project - Free Software Foundation"
 msgstr "De ce GNU/Linux? - Proiectul GNU - Fundația pentru Software Liber"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "What's in a Name?"
 msgstr "Ce-i într-un nume?"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 # | by <a [-href=\"http://www.stallman.org/\";>Richard M.-]
 # | {+href=\"https://www.stallman.org/\";>Richard+} Stallman</a>
 #, fuzzy
@@ -36,10 +36,52 @@
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "de <a href=\"http://www.stallman.org/\";>Richard M. Stallman</a>"
 
+#. type: Content of: <div><p>
+# | Names convey meanings; our choice of names determines the meaning of what
+# | we say.  An inappropriate name gives people the wrong idea.  A rose by any
+# | other name would smell as sweet&mdash;but if you call it a pen, people
+# | will be rather disappointed when they try to write with it.  And if you
+# | call pens [-&ldquo;roses&rdquo;,-] {+&ldquo;roses,&rdquo;+} people may not
+# | realize what they are good for.  If you call our operating system Linux,
+# | that conveys a mistaken idea of the system's origin, history, and purpose.
+# |  If you call it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that
+# | conveys (though not in detail) an accurate idea.
+#, fuzzy
+#| msgid ""
+#| "Names convey meanings; our choice of names determines the meaning of what "
+#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
+#| "any other name would smell as sweet&mdash;but if you call it a pen, "
+#| "people will be rather disappointed when they try to write with it.  And "
+#| "if you call pens &ldquo;roses&rdquo;, people may not realize what they "
+#| "are good for.  If you call our operating system Linux, that conveys a "
+#| "mistaken idea of the system's origin, history, and purpose.  If you call "
+#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
+#| "(though not in detail) an accurate idea."
+msgid ""
+"Names convey meanings; our choice of names determines the meaning of what we "
+"say.  An inappropriate name gives people the wrong idea.  A rose by any "
+"other name would smell as sweet&mdash;but if you call it a pen, people will "
+"be rather disappointed when they try to write with it.  And if you call pens "
+"&ldquo;roses,&rdquo; people may not realize what they are good for.  If you "
+"call our operating system Linux, that conveys a mistaken idea of the "
+"system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
+"and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
+"accurate idea."
+msgstr ""
+"Numele implică înțelesuri; opțiunea noastră pentru nume determină 
înțelesul "
+"exprimării noastre. Un nume nepotrivit crează oamenilor impresii greșite. 
Un "
+"trandafir miroase la fel de frumos indiferent de nume, dar dacă îl numești 
"
+"stilou, oamenii vor fi dezamăgiți încercând să scrie cu el. Iar dacă 
numești "
+"stilourile „trandafiri”, oamenii nu-și vor da seama la ce folosesc. 
Dacă "
+"denumești sistemul nostru de operare Linux, acest lucru generează o idee "
+"eronată despre originea sistemului, istoria și scopul său. Dacă 
denumești "
+"sistemul <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, numele transmite "
+"(deși nu chiar în detaliu) un înțeles corect."
+
 #. type: Content of: <div><div><p>
 # | [-For an explanation of-]{+To learn more about this issue, you can read
 # | our <a href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
-# | href=\"/gnu/linux-and-gnu.html\">Linux and+} the {+GNU Project</a>, which
+# | href=\"/gnu/linux-and-gnu.html\">Linux and+} the {+GNU System</a>, which
 # | gives a+} history of the GNU/Linux system as it relates to [-the
 # | question-] {+this issue+} of naming, [-see <a
 # | 
href=\"/gnu/linux-and-gnu.html\">http://www.gnu.org/gnu/linux-and-gnu.html</a>.
@@ -60,7 +102,7 @@
 msgid ""
 "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
 "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>, which gives a history of the GNU/Linux "
+"\">Linux and the GNU System</a>, which gives a history of the GNU/Linux "
 "system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
 "gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
 "a>."
@@ -73,38 +115,6 @@
 "html\">http://www.gnu.org/gnu/gnu-users-never-heard-of-gnu.html</a>."
 
 #. type: Content of: <div><p>
-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>."
-msgstr ""
-"Acest eseu a fost publicat în <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>."
-
-#. type: Content of: <div><div><p>
-msgid ""
-"Names convey meanings; our choice of names determines the meaning of what we "
-"say.  An inappropriate name gives people the wrong idea.  A rose by any "
-"other name would smell as sweet&mdash;but if you call it a pen, people will "
-"be rather disappointed when they try to write with it.  And if you call pens "
-"&ldquo;roses&rdquo;, people may not realize what they are good for.  If you "
-"call our operating system Linux, that conveys a mistaken idea of the "
-"system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
-"and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
-"accurate idea."
-msgstr ""
-"Numele implică înțelesuri; opțiunea noastră pentru nume determină 
înțelesul "
-"exprimării noastre. Un nume nepotrivit crează oamenilor impresii greșite. 
Un "
-"trandafir miroase la fel de frumos indiferent de nume, dar dacă îl numești 
"
-"stilou, oamenii vor fi dezamăgiți încercând să scrie cu el. Iar dacă 
numești "
-"stilourile „trandafiri”, oamenii nu-și vor da seama la ce folosesc. 
Dacă "
-"denumești sistemul nostru de operare Linux, acest lucru generează o idee "
-"eronată despre originea sistemului, istoria și scopul său. Dacă 
denumești "
-"sistemul <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, numele transmite "
-"(deși nu chiar în detaliu) un înțeles corect."
-
-#. type: Content of: <div><div><p>
 # | [-But does-]{+Does+} this {+really+} matter for our community? Is it
 # | important whether people know the system's origin, history, and purpose?
 # | Yes&mdash;because people who forget history are often condemned to repeat
@@ -135,7 +145,7 @@
 "este în siguranță; problemele care ne-au impus să dezvoltăm GNU nu au 
fost "
 "complet eradicate, și ele amenință să revină."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
@@ -143,7 +153,7 @@
 "Când explic de ce este indicat să denumim sistemul de operare 
„Gnu/Linux” în "
 "loc de „Linux”, oamenii răspund uneori astfel:"
 
-#. type: Content of: <div><div><blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "<em> Granted that the GNU Project deserves credit for this work, is it "
 "really worth a fuss when people don't give credit? Isn't the important thing "
@@ -155,7 +165,7 @@
 "a fost făcută, decât cine a făcut-o?  Ar trebui să te relaxezi, să fii "
 "mulțumit de treaba bine făcută, și să nu-ți pese de aprecieri.</em>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "This would be wise advice, if only the situation were like that&mdash;if the "
 "job were done and it were time to relax.  If only that were true! But "
@@ -172,7 +182,7 @@
 "\">GNU/Linux</a> e un mod de a păstra în minte și de a informa pe alții "
 "despre aceste obiective."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | It is possible to write good free software without thinking of GNU; much
 # | good work has been done in the name of Linux also.  But {+the term+}
 # | &ldquo;Linux&rdquo; has been associated ever since it was first coined
@@ -203,7 +213,7 @@
 "industrie, vom avea și mai multe probleme să îl conectăm cu spiritul "
 "comunității."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | A great challenge to the future of free software comes from the tendency
 # | of the &ldquo;Linux&rdquo; distribution companies to add nonfree software
 # | to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of
@@ -212,8 +222,8 @@
 # | itself to free software.+}  Most of them do not clearly identify the
 # | nonfree packages in their distributions.  Many even develop nonfree
 # | software and add it to the system.  Some outrageously advertise
-# | &ldquo;Linux&rdquo; systems that are &ldquo;licensed per seat&rdquo;,
-# | which give the user as much freedom as Microsoft Windows.
+# | &ldquo;Linux&rdquo; systems that are &ldquo;licensed per [-seat&rdquo;,-]
+# | {+seat,&rdquo;+} which give the user as much freedom as Microsoft Windows.
 #, fuzzy
 #| msgid ""
 #| "A great challenge to the future of free software comes from the tendency "
@@ -234,7 +244,7 @@
 "limits itself to free software.  Most of them do not clearly identify the "
 "nonfree packages in their distributions.  Many even develop nonfree software "
 "and add it to the system.  Some outrageously advertise &ldquo;Linux&rdquo; "
-"systems that are &ldquo;licensed per seat&rdquo;, which give the user as "
+"systems that are &ldquo;licensed per seat,&rdquo; which give the user as "
 "much freedom as Microsoft Windows."
 msgstr ""
 "O mare provocare pentru viitorul software-ului liber vine din tendința "
@@ -247,7 +257,29 @@
 "fac reclamă sistemelor „Linux” care sunt licentiațe pe utilizator, 
dându-i "
 "utilizatorului la fel de multă libertate ca Windows-ul lui Microsoft."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People try to justify adding nonfree software in the name of the
+# | &ldquo;popularity of Linux&rdquo;&mdash;in effect, valuing popularity
+# | above freedom.  Sometimes this is openly admitted.  For instance, Wired
+# | Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;feels
+# | that the move toward open source software should be fueled by technical,
+# | rather than political, decisions.&rdquo; And Caldera's <abbr title=\"Chief
+# | Executive Officer\">CEO</abbr> openly urged users to <a
+# | href=\"http{+s+}://www.zdnet.com/article/stallman-love-is-not-free/\">drop
+# | the goal of freedom and work instead for the &ldquo;popularity of
+# | Linux&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "People try to justify adding nonfree software in the name of the &ldquo;"
+#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
+#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
+#| "Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;"
+#| "feels that the move toward open source software should be fueled by "
+#| "technical, rather than political, decisions.&rdquo; And Caldera's <abbr "
+#| "title=\"Chief Executive Officer\">CEO</abbr> openly urged users to <a "
+#| "href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
+#| "goal of freedom and work instead for the &ldquo;popularity of Linux&rdquo;"
+#| "</a>."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -255,7 +287,7 @@
 "said that Robert McMillan, editor of Linux Magazine, &ldquo;feels that the "
 "move toward open source software should be fueled by technical, rather than "
 "political, decisions.&rdquo; And Caldera's <abbr title=\"Chief Executive "
-"Officer\">CEO</abbr> openly urged users to <a href=\"http://www.zdnet.com/";
+"Officer\">CEO</abbr> openly urged users to <a href=\"https://www.zdnet.com/";
 "article/stallman-love-is-not-free/\">drop the goal of freedom and work "
 "instead for the &ldquo;popularity of Linux&rdquo;</a>."
 msgstr ""
@@ -270,7 +302,7 @@
 "obiectiv libertatea și să lucreze în schimb pentru „popularitatea Linux-"
 "ului”</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -288,7 +320,7 @@
 "bun, și a uita țelul libertății. N-are sens să conduci mai repede dacă 
nu "
 "poți rămâne pe șosea."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, it
 # | can become a trap for free software developers.  When they write free
 # | software that depends on the nonfree package, their software cannot be
@@ -331,7 +363,7 @@
 "moment ce LessTif mai are nevoie de îmbunătățiri (oferiți-vă 
voluntari!). Un "
 "efect similar îl are acum varianta Java ne-liberă de la Sun."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -348,7 +380,7 @@
 "găsească inclus. Dacă așa ceva se va întâmpla, campania noastră pentru 
"
 "libertate va fi eșuat."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -373,7 +405,7 @@
 "secrete decât <strong>respingerea programelor ne-libere care le 
utilizează</"
 "strong>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -390,7 +422,7 @@
 "nevoie de acea hotărâre pe care o au oamenii când luptă pentru libertatea 
"
 "lor și a comunității lor, hotărârea de a duce lupta peste ani, până la 
capăt."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 # | In our community, this goal and this determination emanate mainly from the
 # | GNU Project.  We're the ones who talk about freedom and community as
 # | something to stand firm for; the organizations that speak of
@@ -440,19 +472,39 @@
 "au cea mai bună șansă de a fi expuși ideii de libertate și hotărârii 
în "
 "cadrul Proiectului GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid "But when people come across it, will they feel it relates to them?"
 msgstr ""
 "Dar odată expuși acestor idei, vor simți oamenii că au legătură cu ele?"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People who know they are using a system that came out of the GNU Project
+# | can see a direct relationship between themselves and GNU.  They won't
+# | automatically agree with our philosophy, but at least they will see a
+# | reason to think seriously about it.  In contrast, people who consider
+# | themselves &ldquo;Linux [-users&rdquo;,-] {+users,&rdquo;+} and believe
+# | that the GNU Project &ldquo;developed tools which proved to be useful in
+# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} typically perceive only an indirect
+# | relationship between GNU and themselves.  They may just ignore the GNU
+# | philosophy when they come across it.
+#, fuzzy
+#| msgid ""
+#| "People who know they are using a system that came out of the GNU Project "
+#| "can see a direct relationship between themselves and GNU.  They won't "
+#| "automatically agree with our philosophy, but at least they will see a "
+#| "reason to think seriously about it.  In contrast, people who consider "
+#| "themselves &ldquo;Linux users&rdquo;, and believe that the GNU Project "
+#| "&ldquo;developed tools which proved to be useful in Linux&rdquo;, "
+#| "typically perceive only an indirect relationship between GNU and "
+#| "themselves.  They may just ignore the GNU philosophy when they come "
+#| "across it."
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
 "automatically agree with our philosophy, but at least they will see a reason "
 "to think seriously about it.  In contrast, people who consider themselves "
-"&ldquo;Linux users&rdquo;, and believe that the GNU Project &ldquo;developed "
-"tools which proved to be useful in Linux&rdquo;, typically perceive only an "
+"&ldquo;Linux users,&rdquo; and believe that the GNU Project &ldquo;developed "
+"tools which proved to be useful in Linux,&rdquo; typically perceive only an "
 "indirect relationship between GNU and themselves.  They may just ignore the "
 "GNU philosophy when they come across it."
 msgstr ""
@@ -464,11 +516,26 @@
 "în Linux„, percep de obicei doar o relație tangențială (indirectă) 
între GNU "
 "și ei înșiși. Ei ar putea ignora filosofia GNU când o întâlnesc."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project is idealistic, and anyone encouraging idealism today faces
+# | a great obstacle: the prevailing ideology encourages people to dismiss
+# | idealism as [-&ldquo;impractical&rdquo;.-] {+&ldquo;impractical.&rdquo;+}
+# | Our idealism has been extremely practical: it is the reason we have a free
+# | <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> operating system. 
+# | People who love this system ought to know that it is our idealism made
+# | real.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project is idealistic, and anyone encouraging idealism today "
+#| "faces a great obstacle: the prevailing ideology encourages people to "
+#| "dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been "
+#| "extremely practical: it is the reason we have a free <a href=\"/gnu/linux-"
+#| "and-gnu.html\">GNU/Linux</a> operating system.  People who love this "
+#| "system ought to know that it is our idealism made real."
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
-"idealism as &ldquo;impractical&rdquo;.  Our idealism has been extremely "
+"idealism as &ldquo;impractical.&rdquo; Our idealism has been extremely "
 "practical: it is the reason we have a free <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> operating system.  People who love this system ought to "
 "know that it is our idealism made real."
@@ -480,7 +547,7 @@
 "\">GNU/Linux</a>. Cei care iubesc acest sistem ar trebui să știe că "
 "idealismul nostru l-a făcut posibil."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If &ldquo;the job&rdquo; really were done, if there were nothing at stake "
 "except credit, perhaps it would be wiser to let the matter drop.  But we are "
@@ -496,6 +563,25 @@
 "făcut deja. Vă rugăm ajutați-ne, referindu-vă la sistem ca <a 
href=\"/gnu/"
 "linux-and-gnu.html\">GNU/Linux</a>."
 
+#. type: Content of: <div><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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Acest eseu a fost publicat în <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>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -547,8 +633,7 @@
 
 #. type: Content of: <div><p>
 #, fuzzy
-msgid ""
-"Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
 msgstr "Copyright &copy; 2000 Richard Stallman"
 
 #. type: Content of: <div><p>
@@ -572,6 +657,15 @@
 msgstr "Actualizată:"
 
 #~ 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>."
+#~ msgstr ""
+#~ "Acest eseu a fost publicat în <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 ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"
 #~ msgstr ""

Index: gnu/po/why-gnu-linux.ru.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.ru.po,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- gnu/po/why-gnu-linux.ru.po  8 Apr 2021 11:34:36 -0000       1.44
+++ gnu/po/why-gnu-linux.ru.po  30 Aug 2021 13:34:55 -0000      1.45
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: why-gnu-linux.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-04-07 17:17+0000\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <www-ru-list@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-08-30 13:26+0000\n"
 "X-Poedit-Language: Russian\n"
 
 # type: Content of: <title>
@@ -26,50 +27,43 @@
 "Почему GNU/Linux? - Проект GNU - Фонд свободного 
программного обеспечения"
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "What's in a Name?"
 msgstr "Что в имени?"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"https://www.stallman.org/\";>Ричард Столмен</a>"
 
-# type: Content of: <div><blockquote><p>
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
-"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>, which gives a history of the GNU/Linux "
-"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Чтобы узнать больше об этом вопросе, вы 
можете прочитать наши <a href=\"/gnu/"
-"gnu-linux-faq.html\">&ldquo;Вопросы о GNU/Linux&rdquo;</a>, 
страницу <a href="
-"\"/gnu/linux-and-gnu.html\">&ldquo;Linux и проект GNU&rdquo;</a>, на 
которой "
-"приведена история системы GNU/Linux в 
отношении к этой проблеме "
-"наименования, а также <a 
href=\"/gnu/gnu-users-never-heard-of-gnu.html"
-"\">&ldquo;Пользователи GNU, которые никогда не 
слышали о GNU&rdquo;</a>."
-
-#. type: Content of: <div><p>
-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>."
-msgstr ""
-"Этот очерк публикуется в сборнике <a 
href=\"http://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Свободные программы, 
свободное общество: "
-"избранные очерки Ричарда М. 
Столмена</cite></a>."
-
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | Names convey meanings; our choice of names determines the meaning of what
+# | we say.  An inappropriate name gives people the wrong idea.  A rose by any
+# | other name would smell as sweet&mdash;but if you call it a pen, people
+# | will be rather disappointed when they try to write with it.  And if you
+# | call pens [-&ldquo;roses&rdquo;,-] {+&ldquo;roses,&rdquo;+} people may not
+# | realize what they are good for.  If you call our operating system Linux,
+# | that conveys a mistaken idea of the system's origin, history, and purpose.
+# |  If you call it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that
+# | conveys (though not in detail) an accurate idea.
+#, fuzzy
+#| msgid ""
+#| "Names convey meanings; our choice of names determines the meaning of what "
+#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
+#| "any other name would smell as sweet&mdash;but if you call it a pen, "
+#| "people will be rather disappointed when they try to write with it.  And "
+#| "if you call pens &ldquo;roses&rdquo;, people may not realize what they "
+#| "are good for.  If you call our operating system Linux, that conveys a "
+#| "mistaken idea of the system's origin, history, and purpose.  If you call "
+#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
+#| "(though not in detail) an accurate idea."
 msgid ""
 "Names convey meanings; our choice of names determines the meaning of what we "
 "say.  An inappropriate name gives people the wrong idea.  A rose by any "
 "other name would smell as sweet&mdash;but if you call it a pen, people will "
 "be rather disappointed when they try to write with it.  And if you call pens "
-"&ldquo;roses&rdquo;, people may not realize what they are good for.  If you "
+"&ldquo;roses,&rdquo; people may not realize what they are good for.  If you "
 "call our operating system Linux, that conveys a mistaken idea of the "
 "system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
 "and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
@@ -86,8 +80,40 @@
 "GNU/Linux&rdquo;</a>, это передаёт (хоть и не во всех 
подробностях) "
 "правильное представление."
 
-# type: Content of: <p>
+# type: Content of: <div><blockquote><p>
 #. type: Content of: <div><div><p>
+# | To learn more about this issue, you can read our <a
+# | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
+# | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU [-Project</a>,-]
+# | {+System</a>,+} which gives a history of the GNU/Linux system as it
+# | relates to this issue of naming, and our page on <a
+# | href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never
+# | Heard of GNU</a>.
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+#| "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu."
+#| "html\">Linux and the GNU Project</a>, which gives a history of the GNU/"
+#| "Linux system as it relates to this issue of naming, and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>, which gives a history of the GNU/Linux "
+"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Чтобы узнать больше об этом вопросе, вы 
можете прочитать наши <a href=\"/gnu/"
+"gnu-linux-faq.html\">&ldquo;Вопросы о GNU/Linux&rdquo;</a>, 
страницу <a href="
+"\"/gnu/linux-and-gnu.html\">&ldquo;Linux и проект GNU&rdquo;</a>, на 
которой "
+"приведена история системы GNU/Linux в 
отношении к этой проблеме "
+"наименования, а также <a 
href=\"/gnu/gnu-users-never-heard-of-gnu.html"
+"\">&ldquo;Пользователи GNU, которые никогда не 
слышали о GNU&rdquo;</a>."
+
+# type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Does this really matter for our community? Is it important whether people "
 "know the system's origin, history, and purpose? Yes&mdash;because people who "
@@ -104,7 +130,7 @@
 "привели нас к разработке GNU, и они угрожают 
возобновиться."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
@@ -113,7 +139,7 @@
 "а не &ldquo;Linux&rdquo;, мне иногда отвечают так:"
 
 # type: Content of: <blockquote><p>
-#. type: Content of: <div><div><blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "<em> Granted that the GNU Project deserves credit for this work, is it "
 "really worth a fuss when people don't give credit? Isn't the important thing "
@@ -126,7 +152,7 @@
 "выполненной работой и не беспокоиться о 
благодарностях. </em> "
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "This would be wise advice, if only the situation were like that&mdash;if the "
 "job were done and it were time to relax.  If only that were true! But "
@@ -144,7 +170,7 @@
 "один из способов напомнить себе и 
поведать другим об этих целях."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "It is possible to write good free software without thinking of GNU; much "
 "good work has been done in the name of Linux also.  But the term &ldquo;"
@@ -160,7 +186,27 @@
 "в будущем нам станет ещё труднее 
соединять его с духом единства."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | A great challenge to the future of free software comes from the tendency
+# | of the &ldquo;Linux&rdquo; distribution companies to add nonfree software
+# | to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of
+# | convenience and power.  All the major commercial distribution developers
+# | do this; none limits itself to free software.  Most of them do not clearly
+# | identify the nonfree packages in their distributions.  Many even develop
+# | nonfree software and add it to the system.  Some outrageously advertise
+# | &ldquo;Linux&rdquo; systems that are &ldquo;licensed per [-seat&rdquo;,-]
+# | {+seat,&rdquo;+} which give the user as much freedom as Microsoft Windows.
+#, fuzzy
+#| msgid ""
+#| "A great challenge to the future of free software comes from the tendency "
+#| "of the &ldquo;Linux&rdquo; distribution companies to add nonfree software "
+#| "to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of "
+#| "convenience and power.  All the major commercial distribution developers "
+#| "do this; none limits itself to free software.  Most of them do not "
+#| "clearly identify the nonfree packages in their distributions.  Many even "
+#| "develop nonfree software and add it to the system.  Some outrageously "
+#| "advertise &ldquo;Linux&rdquo; systems that are &ldquo;licensed per "
+#| "seat&rdquo;, which give the user as much freedom as Microsoft Windows."
 msgid ""
 "A great challenge to the future of free software comes from the tendency of "
 "the &ldquo;Linux&rdquo; distribution companies to add nonfree software to <a "
@@ -169,7 +215,7 @@
 "limits itself to free software.  Most of them do not clearly identify the "
 "nonfree packages in their distributions.  Many even develop nonfree software "
 "and add it to the system.  Some outrageously advertise &ldquo;Linux&rdquo; "
-"systems that are &ldquo;licensed per seat&rdquo;, which give the user as "
+"systems that are &ldquo;licensed per seat,&rdquo; which give the user as "
 "much freedom as Microsoft Windows."
 msgstr ""
 "Опаснейшая угроза будущему свободного 
программного обеспечения исходит от "
@@ -185,7 +231,29 @@
 "Windows."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People try to justify adding nonfree software in the name of the
+# | &ldquo;popularity of Linux&rdquo;&mdash;in effect, valuing popularity
+# | above freedom.  Sometimes this is openly admitted.  For instance, Wired
+# | Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;feels
+# | that the move toward open source software should be fueled by technical,
+# | rather than political, decisions.&rdquo; And Caldera's <abbr title=\"Chief
+# | Executive Officer\">CEO</abbr> openly urged users to <a
+# | href=\"http{+s+}://www.zdnet.com/article/stallman-love-is-not-free/\">drop
+# | the goal of freedom and work instead for the &ldquo;popularity of
+# | Linux&rdquo;</a>.
+#, fuzzy
+#| msgid ""
+#| "People try to justify adding nonfree software in the name of the &ldquo;"
+#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
+#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
+#| "Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;"
+#| "feels that the move toward open source software should be fueled by "
+#| "technical, rather than political, decisions.&rdquo; And Caldera's <abbr "
+#| "title=\"Chief Executive Officer\">CEO</abbr> openly urged users to <a "
+#| "href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
+#| "goal of freedom and work instead for the &ldquo;popularity of Linux&rdquo;"
+#| "</a>."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -193,7 +261,7 @@
 "said that Robert McMillan, editor of Linux Magazine, &ldquo;feels that the "
 "move toward open source software should be fueled by technical, rather than "
 "political, decisions.&rdquo; And Caldera's <abbr title=\"Chief Executive "
-"Officer\">CEO</abbr> openly urged users to <a href=\"http://www.zdnet.com/";
+"Officer\">CEO</abbr> openly urged users to <a href=\"https://www.zdnet.com/";
 "article/stallman-love-is-not-free/\">drop the goal of freedom and work "
 "instead for the &ldquo;popularity of Linux&rdquo;</a>."
 msgstr ""
@@ -209,7 +277,7 @@
 "повышением &ldquo;популярности Linux&rdquo;</a>."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -228,7 +296,7 @@
 "вы не можете удержаться на дороге."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, it "
 "can become a trap for free software developers.  When they write free "
@@ -252,7 +320,7 @@
 "\">западне Java</a>; к счастью, в настоящее 
время это в основном исправлено."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -270,7 +338,7 @@
 "движение за свободу ожидает провал."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -295,7 +363,7 @@
 "<strong>отказа от несвободных программ, 
которые их используют</strong>."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -313,7 +381,7 @@
 "&mdash; решимость бороться, не прекращая, 
долгие годы."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "In our community, this goal and this determination emanate mainly from the "
 "GNU Project.  We're the ones who talk about freedom and community as "
@@ -339,20 +407,40 @@
 "могут встретиться с идеей свободы и 
решимостью&nbsp;&mdash; это проект GNU."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid "But when people come across it, will they feel it relates to them?"
 msgstr ""
 "Но когда люди встретятся с этим, 
почувствуют ли они, что их это касается?"
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | People who know they are using a system that came out of the GNU Project
+# | can see a direct relationship between themselves and GNU.  They won't
+# | automatically agree with our philosophy, but at least they will see a
+# | reason to think seriously about it.  In contrast, people who consider
+# | themselves &ldquo;Linux [-users&rdquo;,-] {+users,&rdquo;+} and believe
+# | that the GNU Project &ldquo;developed tools which proved to be useful in
+# | [-Linux&rdquo;,-] {+Linux,&rdquo;+} typically perceive only an indirect
+# | relationship between GNU and themselves.  They may just ignore the GNU
+# | philosophy when they come across it.
+#, fuzzy
+#| msgid ""
+#| "People who know they are using a system that came out of the GNU Project "
+#| "can see a direct relationship between themselves and GNU.  They won't "
+#| "automatically agree with our philosophy, but at least they will see a "
+#| "reason to think seriously about it.  In contrast, people who consider "
+#| "themselves &ldquo;Linux users&rdquo;, and believe that the GNU Project "
+#| "&ldquo;developed tools which proved to be useful in Linux&rdquo;, "
+#| "typically perceive only an indirect relationship between GNU and "
+#| "themselves.  They may just ignore the GNU philosophy when they come "
+#| "across it."
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
 "automatically agree with our philosophy, but at least they will see a reason "
 "to think seriously about it.  In contrast, people who consider themselves "
-"&ldquo;Linux users&rdquo;, and believe that the GNU Project &ldquo;developed "
-"tools which proved to be useful in Linux&rdquo;, typically perceive only an "
+"&ldquo;Linux users,&rdquo; and believe that the GNU Project &ldquo;developed "
+"tools which proved to be useful in Linux,&rdquo; typically perceive only an "
 "indirect relationship between GNU and themselves.  They may just ignore the "
 "GNU philosophy when they come across it."
 msgstr ""
@@ -366,11 +454,26 @@
 "проигнорировать философию GNU, когда 
встретятся с ней."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+# | The GNU Project is idealistic, and anyone encouraging idealism today faces
+# | a great obstacle: the prevailing ideology encourages people to dismiss
+# | idealism as [-&ldquo;impractical&rdquo;.-] {+&ldquo;impractical.&rdquo;+}
+# | Our idealism has been extremely practical: it is the reason we have a free
+# | <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> operating system. 
+# | People who love this system ought to know that it is our idealism made
+# | real.
+#, fuzzy
+#| msgid ""
+#| "The GNU Project is idealistic, and anyone encouraging idealism today "
+#| "faces a great obstacle: the prevailing ideology encourages people to "
+#| "dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been "
+#| "extremely practical: it is the reason we have a free <a href=\"/gnu/linux-"
+#| "and-gnu.html\">GNU/Linux</a> operating system.  People who love this "
+#| "system ought to know that it is our idealism made real."
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
-"idealism as &ldquo;impractical&rdquo;.  Our idealism has been extremely "
+"idealism as &ldquo;impractical.&rdquo; Our idealism has been extremely "
 "practical: it is the reason we have a free <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> operating system.  People who love this system ought to "
 "know that it is our idealism made real."
@@ -384,7 +487,7 @@
 "жизнь."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If &ldquo;the job&rdquo; really were done, if there were nothing at stake "
 "except credit, perhaps it would be wiser to let the matter drop.  But we are "
@@ -400,6 +503,22 @@
 "Пожалуйста, помогите нам, называя эту 
операционную систему <a href=\"/gnu/"
 "linux-and-gnu.html\">&ldquo;GNU/Linux&rdquo;</a>."
 
+#. type: Content of: <div><div><p>
+# || No change detected.  The change might only be in amounts of spaces.
+#, fuzzy
+#| msgid ""
+#| "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>."
+msgid ""
+"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 ""
+"Этот очерк публикуется в сборнике <a 
href=\"https://shop.fsf.org/product/";
+"free-software-free-society/\"><cite>Свободные программы, 
свободное общество: "
+"избранные очерки Ричарда М. 
Столмена</cite></a>."
+
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -445,8 +564,12 @@
 "translations.html\">&ldquo;Руководстве по 
переводам&rdquo;</a>."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+# | Copyright &copy; 2000, [-2006,-] 2007, [-2014-2016, 2020,-] 2021 Richard
+# | Stallman
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 2000, 2006, 2007, 2014, 2015, 2016, 2020, 2021 Richard "
 "Stallman <br />Copyright &copy; 2010 Vladimir Smolyar (translation)<br /"
@@ -475,6 +598,15 @@
 msgid "Updated:"
 msgstr "Обновлено:"
 
+#~ 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>."
+#~ msgstr ""
+#~ "Этот очерк публикуется в сборнике <a 
href=\"http://shop.fsf.org/product/";
+#~ "free-software-free-society/\"><cite>Свободные программы, 
свободное "
+#~ "общество: избранные очерки Ричарда М. 
Столмена</cite></a>."
+
 # type: Content of: <p>
 #~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"

Index: gnu/po/why-gnu-linux.sq.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.sq.po,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- gnu/po/why-gnu-linux.sq.po  31 May 2021 11:30:24 -0000      1.59
+++ gnu/po/why-gnu-linux.sq.po  30 Aug 2021 13:34:55 -0000      1.60
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: \n"
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "X-Generator: Poedit 2.4.2\n"
 
 # type: Content of: <title>
@@ -22,49 +23,33 @@
 msgstr "Pse GNU/Linux? - Projekti GNU - Free Software Foundation"
 
 # type: Content of: <h2>
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "What's in a Name?"
 msgstr "Ç’përmban Emri?"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "nga <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-# type: Content of: <div><blockquote><p>
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
-"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>, which gives a history of the GNU/Linux "
-"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Për të mësuar më tepër rreth kësaj çështje, mund të lexoni <a 
href=\"/gnu/"
-"gnu-linux-faq.html\">GNU/Linux FAQ</a>, faqen tonë mbi <a href=\"/gnu/linux-"
-"and-gnu.html\">Linux-in dhe Projektin GNU</a>, që jep një historik të "
-"sistemit GNU/Linux e ku përmendet kjo puna e emrit, dhe faqen tonë mbi <a "
-"href=\"/gnu/gnu-users-never-heard-of-gnu.html\">Përdorues të GNU-së Që 
Nuk "
-"Kanë Dëgjuar Kurrë Për GNU-në</a>."
-
-#. type: Content of: <div><p>
-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>."
-msgstr ""
-"Kjo sprovë është botuar te <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>."
-
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Names convey meanings; our choice of names determines the meaning of what "
+#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
+#| "any other name would smell as sweet&mdash;but if you call it a pen, "
+#| "people will be rather disappointed when they try to write with it.  And "
+#| "if you call pens &ldquo;roses&rdquo;, people may not realize what they "
+#| "are good for.  If you call our operating system Linux, that conveys a "
+#| "mistaken idea of the system's origin, history, and purpose.  If you call "
+#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
+#| "(though not in detail) an accurate idea."
 msgid ""
 "Names convey meanings; our choice of names determines the meaning of what we "
 "say.  An inappropriate name gives people the wrong idea.  A rose by any "
 "other name would smell as sweet&mdash;but if you call it a pen, people will "
 "be rather disappointed when they try to write with it.  And if you call pens "
-"&ldquo;roses&rdquo;, people may not realize what they are good for.  If you "
+"&ldquo;roses,&rdquo; people may not realize what they are good for.  If you "
 "call our operating system Linux, that conveys a mistaken idea of the "
 "system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
 "and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
@@ -81,8 +66,33 @@
 "quajtët <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, kjo përcjell 
(por "
 "jo edhe aq hollësisht) një ide më të saktë."
 
-# type: Content of: <p>
+# type: Content of: <div><blockquote><p>
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+#| "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu."
+#| "html\">Linux and the GNU Project</a>, which gives a history of the GNU/"
+#| "Linux system as it relates to this issue of naming, and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>, which gives a history of the GNU/Linux "
+"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Për të mësuar më tepër rreth kësaj çështje, mund të lexoni <a 
href=\"/gnu/"
+"gnu-linux-faq.html\">GNU/Linux FAQ</a>, faqen tonë mbi <a href=\"/gnu/linux-"
+"and-gnu.html\">Linux-in dhe Projektin GNU</a>, që jep një historik të "
+"sistemit GNU/Linux e ku përmendet kjo puna e emrit, dhe faqen tonë mbi <a "
+"href=\"/gnu/gnu-users-never-heard-of-gnu.html\">Përdorues të GNU-së Që 
Nuk "
+"Kanë Dëgjuar Kurrë Për GNU-në</a>."
+
+# type: Content of: <p>
+#. type: Content of: <div><p>
 msgid ""
 "Does this really matter for our community? Is it important whether people "
 "know the system's origin, history, and purpose? Yes&mdash;because people who "
@@ -100,7 +110,7 @@
 "kthimin e tyre."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
@@ -109,7 +119,7 @@
 "se Linux, njerëzit ngandonjëherë përgjigjen kështu:"
 
 # type: Content of: <blockquote><p>
-#. type: Content of: <div><div><blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "<em> Granted that the GNU Project deserves credit for this work, is it "
 "really worth a fuss when people don't give credit? Isn't the important thing "
@@ -122,7 +132,7 @@
 "punën e mbaruar bukur, dhe mos çani kryet për hakën.  </em>"
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "This would be wise advice, if only the situation were like that&mdash;if the "
 "job were done and it were time to relax.  If only that were true! But "
@@ -140,7 +150,7 @@
 "edhe të tjerëve këto qëllime."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "It is possible to write good free software without thinking of GNU; much "
 "good work has been done in the name of Linux also.  But the term &ldquo;"
@@ -157,7 +167,18 @@
 "ta bëjmë të lidhet me frymën e bashkësisë."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "A great challenge to the future of free software comes from the tendency "
+#| "of the &ldquo;Linux&rdquo; distribution companies to add nonfree software "
+#| "to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of "
+#| "convenience and power.  All the major commercial distribution developers "
+#| "do this; none limits itself to free software.  Most of them do not "
+#| "clearly identify the nonfree packages in their distributions.  Many even "
+#| "develop nonfree software and add it to the system.  Some outrageously "
+#| "advertise &ldquo;Linux&rdquo; systems that are &ldquo;licensed per "
+#| "seat&rdquo;, which give the user as much freedom as Microsoft Windows."
 msgid ""
 "A great challenge to the future of free software comes from the tendency of "
 "the &ldquo;Linux&rdquo; distribution companies to add nonfree software to <a "
@@ -166,7 +187,7 @@
 "limits itself to free software.  Most of them do not clearly identify the "
 "nonfree packages in their distributions.  Many even develop nonfree software "
 "and add it to the system.  Some outrageously advertise &ldquo;Linux&rdquo; "
-"systems that are &ldquo;licensed per seat&rdquo;, which give the user as "
+"systems that are &ldquo;licensed per seat,&rdquo; which give the user as "
 "much freedom as Microsoft Windows."
 msgstr ""
 "Një sfidë e fortë i vjen të ardhmes së software-it të lirë nga prirja 
e "
@@ -181,7 +202,19 @@
 "Microsoft Windows."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "People try to justify adding nonfree software in the name of the &ldquo;"
+#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
+#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
+#| "Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;"
+#| "feels that the move toward open source software should be fueled by "
+#| "technical, rather than political, decisions.&rdquo; And Caldera's <abbr "
+#| "title=\"Chief Executive Officer\">CEO</abbr> openly urged users to <a "
+#| "href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
+#| "goal of freedom and work instead for the &ldquo;popularity of Linux&rdquo;"
+#| "</a>."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -189,7 +222,7 @@
 "said that Robert McMillan, editor of Linux Magazine, &ldquo;feels that the "
 "move toward open source software should be fueled by technical, rather than "
 "political, decisions.&rdquo; And Caldera's <abbr title=\"Chief Executive "
-"Officer\">CEO</abbr> openly urged users to <a href=\"http://www.zdnet.com/";
+"Officer\">CEO</abbr> openly urged users to <a href=\"https://www.zdnet.com/";
 "article/stallman-love-is-not-free/\">drop the goal of freedom and work "
 "instead for the &ldquo;popularity of Linux&rdquo;</a>."
 msgstr ""
@@ -205,7 +238,7 @@
 "&ldquo;popullaritetin e Linux-it&rdquo;</a>."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -224,7 +257,7 @@
 "shtosh shpejtësinë, kur s’rri dot brenda rrugës."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, it "
 "can become a trap for free software developers.  When they write free "
@@ -248,7 +281,7 @@
 "tani thuajse të ndrequr."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -266,7 +299,7 @@
 "fushata jonë për liri do të ketë dështuar."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -291,7 +324,7 @@
 "ato</strong>."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -311,7 +344,7 @@
 "hequr dorë."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "In our community, this goal and this determination emanate mainly from the "
 "GNU Project.  We're the ones who talk about freedom and community as "
@@ -339,19 +372,30 @@
 "Projekti GNU."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid "But when people come across it, will they feel it relates to them?"
 msgstr "Por kur njerëzit i hasin, do ta ndjejnë që ka lidhje me ta?"
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "People who know they are using a system that came out of the GNU Project "
+#| "can see a direct relationship between themselves and GNU.  They won't "
+#| "automatically agree with our philosophy, but at least they will see a "
+#| "reason to think seriously about it.  In contrast, people who consider "
+#| "themselves &ldquo;Linux users&rdquo;, and believe that the GNU Project "
+#| "&ldquo;developed tools which proved to be useful in Linux&rdquo;, "
+#| "typically perceive only an indirect relationship between GNU and "
+#| "themselves.  They may just ignore the GNU philosophy when they come "
+#| "across it."
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
 "automatically agree with our philosophy, but at least they will see a reason "
 "to think seriously about it.  In contrast, people who consider themselves "
-"&ldquo;Linux users&rdquo;, and believe that the GNU Project &ldquo;developed "
-"tools which proved to be useful in Linux&rdquo;, typically perceive only an "
+"&ldquo;Linux users,&rdquo; and believe that the GNU Project &ldquo;developed "
+"tools which proved to be useful in Linux,&rdquo; typically perceive only an "
 "indirect relationship between GNU and themselves.  They may just ignore the "
 "GNU philosophy when they come across it."
 msgstr ""
@@ -365,11 +409,19 @@
 "së. Ata thjesht mund ta shpërfillin filozofinë e GNU-së, kur e ndeshin."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Project is idealistic, and anyone encouraging idealism today "
+#| "faces a great obstacle: the prevailing ideology encourages people to "
+#| "dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been "
+#| "extremely practical: it is the reason we have a free <a href=\"/gnu/linux-"
+#| "and-gnu.html\">GNU/Linux</a> operating system.  People who love this "
+#| "system ought to know that it is our idealism made real."
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
-"idealism as &ldquo;impractical&rdquo;.  Our idealism has been extremely "
+"idealism as &ldquo;impractical.&rdquo; Our idealism has been extremely "
 "practical: it is the reason we have a free <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> operating system.  People who love this system ought to "
 "know that it is our idealism made real."
@@ -382,7 +434,7 @@
 "dinin që ai është idealizmi ynë i shndërruar në diçka të prekshme."
 
 # type: Content of: <p>
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If &ldquo;the job&rdquo; really were done, if there were nothing at stake "
 "except credit, perhaps it would be wiser to let the matter drop.  But we are "
@@ -398,6 +450,21 @@
 "ndihmoni, duke e quajtur sistemin operativ <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a>."
 
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "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>."
+msgid ""
+"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 ""
+"Kjo sprovë është botuar te <a href=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"> <cite>Software i Lirë, Shoqëri e Lirë: Sprova 
të "
+"Përzgjedhura të Richard M. Stallman-it</cite></a>."
+
 # type: Content of: <div>
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
@@ -446,8 +513,10 @@
 "standards/README.translations.html\">README për përkthimet</a>."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
 msgstr ""
 "Të drejta kopjimi &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard "
 "Stallman"
@@ -472,3 +541,12 @@
 #. type: Content of: <div><p>
 msgid "Updated:"
 msgstr "U përditësua më:"
+
+#~ 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>."
+#~ msgstr ""
+#~ "Kjo sprovë është botuar te <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>."

Index: gnu/po/why-gnu-linux.sr.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.sr.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- gnu/po/why-gnu-linux.sr.po  31 May 2021 09:06:18 -0000      1.32
+++ gnu/po/why-gnu-linux.sr.po  30 Aug 2021 13:34:55 -0000      1.33
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: why-gnu-linux.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2011-09-09 15:16+0200\n"
 "Last-Translator: Strahinya Radich <vilinkamen@mail.ru>\n"
 "Language-Team: Serbian <www-sr-dev@lists.gnu.org>\n"
@@ -24,17 +24,49 @@
 msgid "Why GNU/Linux? - GNU Project - Free Software Foundation"
 msgstr "Зашто ГНУ са Линуксом — Пројекат ГНУ 
— Задужбина за слободни софтвер"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "What's in a Name?"
 msgstr "Шта је у имену?"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 #, fuzzy
 #| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "од <a href=\"http://www.stallman.org/\";>Ричарда 
Сталмана</a>"
 
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "Names convey meanings; our choice of names determines the meaning of what "
+#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
+#| "any other name would smell as sweet&mdash;but if you call it a pen, "
+#| "people will be rather disappointed when they try to write with it.  And "
+#| "if you call pens &ldquo;roses&rdquo;, people may not realize what they "
+#| "are good for.  If you call our operating system Linux, that conveys a "
+#| "mistaken idea of the system's origin, history, and purpose.  If you call "
+#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
+#| "(though not in detail) an accurate idea."
+msgid ""
+"Names convey meanings; our choice of names determines the meaning of what we "
+"say.  An inappropriate name gives people the wrong idea.  A rose by any "
+"other name would smell as sweet&mdash;but if you call it a pen, people will "
+"be rather disappointed when they try to write with it.  And if you call pens "
+"&ldquo;roses,&rdquo; people may not realize what they are good for.  If you "
+"call our operating system Linux, that conveys a mistaken idea of the "
+"system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
+"and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
+"accurate idea."
+msgstr ""
+"Имена преносе значење; наш избор имена 
одређује значење онога што кажемо. "
+"Неодговарајуће име даје људима погрешну 
представу. Ружа било ког имена би "
+"мирисала слатко&mdash; али ако је назовете 
оловком, људи ће се поприлично "
+"разочарати ако покушају да пишу са њом. И 
ако назовете оловке &ldquo;"
+"ружама&rdquo;, људи можда неће схватити зашта 
су оне добре. Ако зовете наш "
+"оперативни систем Линуксом, то преноси 
погрешно значење о пореклу, историји, "
+"и сврси система. Ако га зовете <a 
href=\"/gnu/linux-and-gnu.html\">ГНУ са "
+"Линуксом</a>, то преноси тачну слику (мада 
не детаљну)."
+
 # | To learn more about this issue, you can read our <a
 # | href=\"/gnu/gnu-linux-faq.html\">GNU/Linux FAQ</a>, our page on <a
 # | href=\"/gnu/linux-and-gnu.html\">Linux and the GNU Project</a>, {+which
@@ -52,7 +84,7 @@
 msgid ""
 "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
 "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>, which gives a history of the GNU/Linux "
+"\">Linux and the GNU System</a>, which gives a history of the GNU/Linux "
 "system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
 "gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
 "a>."
@@ -63,37 +95,6 @@
 "users-never-heard-of-gnu.html\">ГНУ корисницима који 
никада нису чули о ГНУ</"
 "a>."
 
-#. type: Content of: <div><p>
-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>."
-msgstr ""
-"Овај есеј је објављен у књизи <a 
href=\"http://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Слободни софтвер, 
слободно друштво: Одабрани "
-"есеји Ричарда М. Сталмана</cite></a>."
-
-#. type: Content of: <div><div><p>
-msgid ""
-"Names convey meanings; our choice of names determines the meaning of what we "
-"say.  An inappropriate name gives people the wrong idea.  A rose by any "
-"other name would smell as sweet&mdash;but if you call it a pen, people will "
-"be rather disappointed when they try to write with it.  And if you call pens "
-"&ldquo;roses&rdquo;, people may not realize what they are good for.  If you "
-"call our operating system Linux, that conveys a mistaken idea of the "
-"system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
-"and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
-"accurate idea."
-msgstr ""
-"Имена преносе значење; наш избор имена 
одређује значење онога што кажемо. "
-"Неодговарајуће име даје људима погрешну 
представу. Ружа било ког имена би "
-"мирисала слатко&mdash; али ако је назовете 
оловком, људи ће се поприлично "
-"разочарати ако покушају да пишу са њом. И 
ако назовете оловке &ldquo;"
-"ружама&rdquo;, људи можда неће схватити зашта 
су оне добре. Ако зовете наш "
-"оперативни систем Линуксом, то преноси 
погрешно значење о пореклу, историји, "
-"и сврси система. Ако га зовете <a 
href=\"/gnu/linux-and-gnu.html\">ГНУ са "
-"Линуксом</a>, то преноси тачну слику (мада 
не детаљну)."
-
 # | [-But does-]{+Does+} this {+really+} matter for our community? Is it
 # | important whether people know the system's origin, history, and purpose?
 # | Yes&mdash;because people who forget history are often condemned to repeat
@@ -101,7 +102,7 @@
 # | href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> is not [-secure;-]
 # | {+guaranteed to survive;+} the problems that led us to develop GNU are not
 # | completely eradicated, and they threaten to come back.
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "But does this matter for our community? Is it important whether people "
@@ -125,7 +126,7 @@
 "проблеми који су нас навели да развијемо 
ГНУ нису потпуно елиминисани, и они "
 "прете да се врате."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
@@ -133,7 +134,7 @@
 "Када ја објашњавам зашто је примереније 
звати оперативни систем ГНУ са "
 "Линуксом него Линуксом, људи понекад 
одговоре овако:"
 
-#. type: Content of: <div><div><blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "<em> Granted that the GNU Project deserves credit for this work, is it "
 "really worth a fuss when people don't give credit? Isn't the important thing "
@@ -145,7 +146,7 @@
 "посао одрађен, а не ко га је урадио? Треба 
да се опустите, поносите послом "
 "који је добро обављен, а не да бринете о 
признању.  </em>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "This would be wise advice, if only the situation were like that&mdash;if the "
 "job were done and it were time to relax.  If only that were true! But "
@@ -168,7 +169,7 @@
 # | cooperate.  As the name [-becomes used-] {+is+} increasingly {+used+} by
 # | business, we will have even more trouble making it connect with community
 # | spirit.
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "It is possible to write good free software without thinking of GNU; much "
@@ -201,7 +202,7 @@
 # | nonfree software and add it to the system.  Some outrageously advertise
 # | &ldquo;Linux&rdquo; systems that are &ldquo;licensed per seat&rdquo;,
 # | which give the user as much freedom as Microsoft Windows.
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "A great challenge to the future of free software comes from the tendency "
@@ -222,7 +223,7 @@
 "limits itself to free software.  Most of them do not clearly identify the "
 "nonfree packages in their distributions.  Many even develop nonfree software "
 "and add it to the system.  Some outrageously advertise &ldquo;Linux&rdquo; "
-"systems that are &ldquo;licensed per seat&rdquo;, which give the user as "
+"systems that are &ldquo;licensed per seat,&rdquo; which give the user as "
 "much freedom as Microsoft Windows."
 msgstr ""
 "Велики изазов будућности слободног 
софтвера долази од тежње компаније &ldquo;"
@@ -235,7 +236,19 @@
 "Линукс&rdquo; систем који је &ldquo;лиценциран 
по месту&rdquo;, која даје "
 "кориснику исто слобода као и Микрософт 
Виндовс."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "People try to justify adding nonfree software in the name of the &ldquo;"
+#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
+#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
+#| "Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;"
+#| "feels that the move toward open source software should be fueled by "
+#| "technical, rather than political, decisions.&rdquo; And Caldera's <abbr "
+#| "title=\"Chief Executive Officer\">CEO</abbr> openly urged users to <a "
+#| "href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
+#| "goal of freedom and work instead for the &ldquo;popularity of Linux&rdquo;"
+#| "</a>."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -243,7 +256,7 @@
 "said that Robert McMillan, editor of Linux Magazine, &ldquo;feels that the "
 "move toward open source software should be fueled by technical, rather than "
 "political, decisions.&rdquo; And Caldera's <abbr title=\"Chief Executive "
-"Officer\">CEO</abbr> openly urged users to <a href=\"http://www.zdnet.com/";
+"Officer\">CEO</abbr> openly urged users to <a href=\"https://www.zdnet.com/";
 "article/stallman-love-is-not-free/\">drop the goal of freedom and work "
 "instead for the &ldquo;popularity of Linux&rdquo;</a>."
 msgstr ""
@@ -257,7 +270,7 @@
 "stallman-love-is-not-free/\">одустану од циља слободе и 
да уместо тога раде "
 "на &ldquo;популарности Линукса&rdquo;</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -289,7 +302,7 @@
 # | href=\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>rereleasing
 # | its Java platform under GNU GPL</a>.)-] {+Trap</a>, fortunately now mostly
 # | corrected.+}
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
 #| "When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, "
@@ -326,7 +339,7 @@
 "\"http://www.fsf.org/news/fsf-welcomes-gpl-java.html\";>поновног 
објављивања "
 "своје Јава Платформе под ГНУ ОЈЛ-ом</a>.)"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -342,7 +355,7 @@
 "користан без не-слободног софтвера који 
ће корисници очекивати да нађу уз "
 "њега. Ако се ово деси, наша кампања за 
слободу ће бити неуспела."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -365,7 +378,7 @@
 "и тајних формата података, осим да 
<strong>одбацимо не-слободне програме "
 "који их користе</strong>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -382,7 +395,7 @@
 "одлучност коју људи имају када се боре за 
своје слободе и за своје "
 "заједнице, одлучност да се истраје 
годинама, и да се не одустане."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "In our community, this goal and this determination emanate mainly from the "
 "GNU Project.  We're the ones who talk about freedom and community as "
@@ -407,18 +420,29 @@
 "нашој заједници вероватно да се сусретну 
са идејом слободе и одлучности, "
 "јесте Пројекат ГНУ."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid "But when people come across it, will they feel it relates to them?"
 msgstr "Али када се људи сусретну са њом, дали 
ће је схватити?"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "People who know they are using a system that came out of the GNU Project "
+#| "can see a direct relationship between themselves and GNU.  They won't "
+#| "automatically agree with our philosophy, but at least they will see a "
+#| "reason to think seriously about it.  In contrast, people who consider "
+#| "themselves &ldquo;Linux users&rdquo;, and believe that the GNU Project "
+#| "&ldquo;developed tools which proved to be useful in Linux&rdquo;, "
+#| "typically perceive only an indirect relationship between GNU and "
+#| "themselves.  They may just ignore the GNU philosophy when they come "
+#| "across it."
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
 "automatically agree with our philosophy, but at least they will see a reason "
 "to think seriously about it.  In contrast, people who consider themselves "
-"&ldquo;Linux users&rdquo;, and believe that the GNU Project &ldquo;developed "
-"tools which proved to be useful in Linux&rdquo;, typically perceive only an "
+"&ldquo;Linux users,&rdquo; and believe that the GNU Project &ldquo;developed "
+"tools which proved to be useful in Linux,&rdquo; typically perceive only an "
 "indirect relationship between GNU and themselves.  They may just ignore the "
 "GNU philosophy when they come across it."
 msgstr ""
@@ -430,11 +454,19 @@
 "Линуксу&rdquo;, типично виде само индиректну 
везу између себе и ГНУ-а. Они "
 "ће вероватно само игнорисати ГНУ 
филозофију када се сусретну са њом."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Project is idealistic, and anyone encouraging idealism today "
+#| "faces a great obstacle: the prevailing ideology encourages people to "
+#| "dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been "
+#| "extremely practical: it is the reason we have a free <a href=\"/gnu/linux-"
+#| "and-gnu.html\">GNU/Linux</a> operating system.  People who love this "
+#| "system ought to know that it is our idealism made real."
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
-"idealism as &ldquo;impractical&rdquo;.  Our idealism has been extremely "
+"idealism as &ldquo;impractical.&rdquo; Our idealism has been extremely "
 "practical: it is the reason we have a free <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> operating system.  People who love this system ought to "
 "know that it is our idealism made real."
@@ -446,7 +478,7 @@
 "href=\"/gnu/linux-and-gnu.html\">ГНУ са Линуксом</a>. Људи 
који воле овај "
 "систем би требало да знају да га је наш 
идеализам учинио могућим."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If &ldquo;the job&rdquo; really were done, if there were nothing at stake "
 "except credit, perhaps it would be wiser to let the matter drop.  But we are "
@@ -462,6 +494,21 @@
 "помозите нам тиме што ће те звати 
оперативни систем <a href=\"/gnu/linux-and-"
 "gnu.html\">ГНУ са Линуксом</a>."
 
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Овај есеј је објављен у књизи <a 
href=\"http://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Слободни софтвер, 
слободно друштво: Одабрани "
+"есеји Ричарда М. Сталмана</cite></a>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -510,8 +557,7 @@
 
 #. type: Content of: <div><p>
 #, fuzzy
-msgid ""
-"Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
 msgstr "Copyright &copy; 2000, 2006, 2007 Richard Stallman"
 
 #. type: Content of: <div><p>
@@ -537,6 +583,15 @@
 msgstr "Ажурирано:"
 
 #~ 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>."
+#~ msgstr ""
+#~ "Овај есеј је објављен у књизи <a 
href=\"http://shop.fsf.org/product/free-";
+#~ "software-free-society/\"><cite>Слободни софтвер, 
слободно друштво: "
+#~ "Одабрани есеји Ричарда М. 
Сталмана</cite></a>."
+
+#~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"
 #~ msgstr ""

Index: gnu/po/why-gnu-linux.tr.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.tr.po,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- gnu/po/why-gnu-linux.tr.po  10 Apr 2021 06:36:40 -0000      1.43
+++ gnu/po/why-gnu-linux.tr.po  30 Aug 2021 13:34:55 -0000      1.44
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: why-gnu-linux.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-04-10 08:33+0200\n"
 "Last-Translator: T. E. Kalayci <tekrei@member.fsf.org>\n"
 "Language-Team: Turkish <www-tr-comm@gnu.org>\n"
@@ -18,6 +18,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.4.2\n"
 
@@ -25,47 +26,32 @@
 msgid "Why GNU/Linux? - GNU Project - Free Software Foundation"
 msgstr "Neden GNU/Linux? - GNU Projesi - Özgür Yazılım Vakfı"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "What's in a Name?"
 msgstr "İsim Dediğin Nedir Ki?"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "yazan <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
-"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>, which gives a history of the GNU/Linux "
-"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Bu konu hakkında daha fazla bilgi edinmek için <a 
href=\"/gnu/gnu-linux-faq."
-"html\">GNU/Linux SSS</a>, isimlendirme konusunu GNU/Linux sistemi "
-"tarihçesiyle ilişkili olarak anlatan <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux ve GNU Projesi</a> yazımızı, ve <a href=\"/gnu/gnu-users-never-"
-"heard-of-gnu.html\">GNU'yu Hiç Duymamış GNU Kullanıcıları</a> 
başlıklı "
-"yazımızı okuyabilirsiniz."
-
 #. type: Content of: <div><p>
-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>."
-msgstr ""
-"Bu yazı <a href=\"http://shop.fsf.org/product/free-software-free-society/";
-"\"><cite>Özgür Yazılım, Özgür Toplum: Richard M. Stallman'ın 
Seçilmiş "
-"Yazıları</cite></a> kitabında yayınlanmıştır."
-
-#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Names convey meanings; our choice of names determines the meaning of what "
+#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
+#| "any other name would smell as sweet&mdash;but if you call it a pen, "
+#| "people will be rather disappointed when they try to write with it.  And "
+#| "if you call pens &ldquo;roses&rdquo;, people may not realize what they "
+#| "are good for.  If you call our operating system Linux, that conveys a "
+#| "mistaken idea of the system's origin, history, and purpose.  If you call "
+#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
+#| "(though not in detail) an accurate idea."
 msgid ""
 "Names convey meanings; our choice of names determines the meaning of what we "
 "say.  An inappropriate name gives people the wrong idea.  A rose by any "
 "other name would smell as sweet&mdash;but if you call it a pen, people will "
 "be rather disappointed when they try to write with it.  And if you call pens "
-"&ldquo;roses&rdquo;, people may not realize what they are good for.  If you "
+"&ldquo;roses,&rdquo; people may not realize what they are good for.  If you "
 "call our operating system Linux, that conveys a mistaken idea of the "
 "system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
 "and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
@@ -83,6 +69,30 @@
 "verecektir."
 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+#| "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu."
+#| "html\">Linux and the GNU Project</a>, which gives a history of the GNU/"
+#| "Linux system as it relates to this issue of naming, and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>, which gives a history of the GNU/Linux "
+"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Bu konu hakkında daha fazla bilgi edinmek için <a 
href=\"/gnu/gnu-linux-faq."
+"html\">GNU/Linux SSS</a>, isimlendirme konusunu GNU/Linux sistemi "
+"tarihçesiyle ilişkili olarak anlatan <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux ve GNU Projesi</a> yazımızı, ve <a href=\"/gnu/gnu-users-never-"
+"heard-of-gnu.html\">GNU'yu Hiç Duymamış GNU Kullanıcıları</a> 
başlıklı "
+"yazımızı okuyabilirsiniz."
+
+#. type: Content of: <div><p>
 msgid ""
 "Does this really matter for our community? Is it important whether people "
 "know the system's origin, history, and purpose? Yes&mdash;because people who "
@@ -98,7 +108,7 @@
 "güvende değil; bizi GNU’yu geliştirmeye iten sorunlar tamamen ortadan "
 "kalkmadı. Üstelik bunların tekrar ortaya çıkma tehlikesi var."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
@@ -106,7 +116,7 @@
 "Neden bu işletim sistemine Linux yerine GNU/Linux demenin doğru olduğunu "
 "açıkladığım zaman insanlar bazen şu cevabı veriyor:"
 
-#. type: Content of: <div><div><blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "<em> Granted that the GNU Project deserves credit for this work, is it "
 "really worth a fuss when people don't give credit? Isn't the important thing "
@@ -119,7 +129,7 @@
 "doğru yaptığınız için gurur duymalısınız. Emeğinizin takdir edilip "
 "edilmemesini de dert etmemelisiniz.</em>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "This would be wise advice, if only the situation were like that&mdash;if the "
 "job were done and it were time to relax.  If only that were true! But "
@@ -136,7 +146,7 @@
 "kullanmak, insanların bu idealleri hatırlayıp başkalarını da "
 "bilgilendirmeleri için bir yoldur."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "It is possible to write good free software without thinking of GNU; much "
 "good work has been done in the name of Linux also.  But the term &ldquo;"
@@ -151,7 +161,18 @@
 "Linux ismi, iş dünyası tarafından giderek artan düzeyde 
kullanıldıkça, onu "
 "topluluk ruhuyla bağdaştırmakta daha da büyük sorunlar yaşayacağız."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "A great challenge to the future of free software comes from the tendency "
+#| "of the &ldquo;Linux&rdquo; distribution companies to add nonfree software "
+#| "to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of "
+#| "convenience and power.  All the major commercial distribution developers "
+#| "do this; none limits itself to free software.  Most of them do not "
+#| "clearly identify the nonfree packages in their distributions.  Many even "
+#| "develop nonfree software and add it to the system.  Some outrageously "
+#| "advertise &ldquo;Linux&rdquo; systems that are &ldquo;licensed per "
+#| "seat&rdquo;, which give the user as much freedom as Microsoft Windows."
 msgid ""
 "A great challenge to the future of free software comes from the tendency of "
 "the &ldquo;Linux&rdquo; distribution companies to add nonfree software to <a "
@@ -160,7 +181,7 @@
 "limits itself to free software.  Most of them do not clearly identify the "
 "nonfree packages in their distributions.  Many even develop nonfree software "
 "and add it to the system.  Some outrageously advertise &ldquo;Linux&rdquo; "
-"systems that are &ldquo;licensed per seat&rdquo;, which give the user as "
+"systems that are &ldquo;licensed per seat,&rdquo; which give the user as "
 "much freedom as Microsoft Windows."
 msgstr ""
 "Özgür yazılımın geleceğine karşı önemli bir tehdit; 
&ldquo;Linux&rdquo; "
@@ -174,7 +195,19 @@
 "özgürlük vermeyen, &ldquo;kullanıcı başına lisanslanmış&rdquo; 
&ldquo;"
 "Linux&rdquo; sistemlerinin reklamını yapıyor."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "People try to justify adding nonfree software in the name of the &ldquo;"
+#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
+#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
+#| "Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;"
+#| "feels that the move toward open source software should be fueled by "
+#| "technical, rather than political, decisions.&rdquo; And Caldera's <abbr "
+#| "title=\"Chief Executive Officer\">CEO</abbr> openly urged users to <a "
+#| "href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
+#| "goal of freedom and work instead for the &ldquo;popularity of Linux&rdquo;"
+#| "</a>."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -182,7 +215,7 @@
 "said that Robert McMillan, editor of Linux Magazine, &ldquo;feels that the "
 "move toward open source software should be fueled by technical, rather than "
 "political, decisions.&rdquo; And Caldera's <abbr title=\"Chief Executive "
-"Officer\">CEO</abbr> openly urged users to <a href=\"http://www.zdnet.com/";
+"Officer\">CEO</abbr> openly urged users to <a href=\"https://www.zdnet.com/";
 "article/stallman-love-is-not-free/\">drop the goal of freedom and work "
 "instead for the &ldquo;popularity of Linux&rdquo;</a>."
 msgstr ""
@@ -197,7 +230,7 @@
 "\">özgürlük gayelerini bir kenara bırakıp &ldquo;Linux'un 
popülerliği&rdquo; "
 "için çalışmaya</a> teşvik ediyor."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -216,7 +249,7 @@
 "etmektedir. Eğer arabayı yolda tutmayı beceremiyorsanız, hızlı 
sürmenizin ne "
 "anlamı var?"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, it "
 "can become a trap for free software developers.  When they write free "
@@ -239,7 +272,7 @@
 "\"/philosophy/java-trap.html\">Java Kapanı</a>, neyse ki şimdi bu durum "
 "çoğunlukla düzeldi."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -256,7 +289,7 @@
 "olmaksızın pek kullanışlı olmayacak. Bu gerçekleşirse özgürlük 
çabalarımız "
 "başarısızlığa uğramış demektir."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -279,7 +312,7 @@
 "etmek için <strong>bunları kullanan özgür olmayan yazılımları 
reddetmekten</"
 "strong> başka bir yolumuz kalmayacak."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -297,7 +330,7 @@
 "özgürlüğü için savaşan, bunu yıllarca sürdürüp yılmayan 
insanların "
 "kararlılığına ihtiyacımız var."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "In our community, this goal and this determination emanate mainly from the "
 "GNU Project.  We're the ones who talk about freedom and community as "
@@ -323,20 +356,31 @@
 "topluluğumuzdaki insanların, özgürlük ve kararlılık idealleriyle "
 "buluştukları başlıca mekan GNU Projesi'dir."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid "But when people come across it, will they feel it relates to them?"
 msgstr ""
 "Peki insanlar bu ideallerle buluştuklarında, bu ideallerin kendileriyle "
 "bağlantısını hissedebilecekler mi?"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "People who know they are using a system that came out of the GNU Project "
+#| "can see a direct relationship between themselves and GNU.  They won't "
+#| "automatically agree with our philosophy, but at least they will see a "
+#| "reason to think seriously about it.  In contrast, people who consider "
+#| "themselves &ldquo;Linux users&rdquo;, and believe that the GNU Project "
+#| "&ldquo;developed tools which proved to be useful in Linux&rdquo;, "
+#| "typically perceive only an indirect relationship between GNU and "
+#| "themselves.  They may just ignore the GNU philosophy when they come "
+#| "across it."
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
 "automatically agree with our philosophy, but at least they will see a reason "
 "to think seriously about it.  In contrast, people who consider themselves "
-"&ldquo;Linux users&rdquo;, and believe that the GNU Project &ldquo;developed "
-"tools which proved to be useful in Linux&rdquo;, typically perceive only an "
+"&ldquo;Linux users,&rdquo; and believe that the GNU Project &ldquo;developed "
+"tools which proved to be useful in Linux,&rdquo; typically perceive only an "
 "indirect relationship between GNU and themselves.  They may just ignore the "
 "GNU philosophy when they come across it."
 msgstr ""
@@ -349,11 +393,19 @@
 "arasında sadece dolaylı bir ilişki kurabilirler. GNU felsefesiyle karşı "
 "karşıya geldiklerinde de bu felsefeyi gözardı etmeleri muhtemeldir."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Project is idealistic, and anyone encouraging idealism today "
+#| "faces a great obstacle: the prevailing ideology encourages people to "
+#| "dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been "
+#| "extremely practical: it is the reason we have a free <a href=\"/gnu/linux-"
+#| "and-gnu.html\">GNU/Linux</a> operating system.  People who love this "
+#| "system ought to know that it is our idealism made real."
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
-"idealism as &ldquo;impractical&rdquo;.  Our idealism has been extremely "
+"idealism as &ldquo;impractical.&rdquo; Our idealism has been extremely "
 "practical: it is the reason we have a free <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> operating system.  People who love this system ought to "
 "know that it is our idealism made real."
@@ -366,7 +418,7 @@
 "aslında. Bu sistemi seven insanlar bunun bizim idealizmimiz sayesinde "
 "gerçekleştiğini bilirler."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If &ldquo;the job&rdquo; really were done, if there were nothing at stake "
 "except credit, perhaps it would be wiser to let the matter drop.  But we are "
@@ -382,6 +434,21 @@
 "Lütfen işletim sistemini <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> "
 "olarak adlandırarak bize yardımcı olun."
 
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "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>."
+msgid ""
+"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 ""
+"Bu yazı <a href=\"https://shop.fsf.org/product/free-software-free-society/";
+"\"><cite>Özgür Yazılım, Özgür Toplum: Richard M. Stallman'ın 
Seçilmiş "
+"Yazıları</cite></a> kitabında yayınlanmıştır."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -429,8 +496,10 @@
 "\">çalışma&nbsp;sayfamızı</a> ziyaret edebilirsiniz."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
 
@@ -465,6 +534,15 @@
 msgstr "Son Güncelleme:"
 
 #~ 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>."
+#~ msgstr ""
+#~ "Bu yazı <a href=\"http://shop.fsf.org/product/free-software-free-society/";
+#~ "\"><cite>Özgür Yazılım, Özgür Toplum: Richard M. Stallman'ın 
Seçilmiş "
+#~ "Yazıları</cite></a> kitabında yayınlanmıştır."
+
+#~ msgid ""
 #~ "P.S. For an explanation of the history of the GNU/Linux system as it "
 #~ "relates to this issue of naming, see <a href=\"/gnu/linux-and-gnu.html"
 #~ "\">http://www.gnu.org/gnu/linux-and-gnu.html</a>.  For answers to other "

Index: gnu/po/why-gnu-linux.uk.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.uk.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gnu/po/why-gnu-linux.uk.po  31 May 2021 20:31:29 -0000      1.16
+++ gnu/po/why-gnu-linux.uk.po  30 Aug 2021 13:34:55 -0000      1.17
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: why-gnu-linux.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2016-07-09 09:43+0200\n"
 "Last-Translator: Andriy Bandura <andriykopanytsia@gmail.com>\n"
 "Language-Team: Ukrainian <>\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-08-30 13:26+0000\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 2.0\n"
@@ -24,47 +25,32 @@
 msgid "Why GNU/Linux? - GNU Project - Free Software Foundation"
 msgstr "Чому GNU/Linux? - Проект GNU - Фонд вільного 
програмного забезпечення"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "What's in a Name?"
 msgstr "Що у назві?"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"https://www.stallman.org/\";>Річард Столмен</a>"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
-"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>, which gives a history of the GNU/Linux "
-"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"Щоби дізнатися більше про цю проблему, ви 
можете прочитати наші <a href=\"/"
-"gnu/gnu-linux-faq.html\">&ldquo;Питання про GNU/Linux&rdquo;</a>, 
сторінку "
-"<a href=\"/gnu/linux-and-gnu.html\">&ldquo;Linux і проект 
GNU&rdquo;</a>, на "
-"якій наведена історія системи GNU/Linux 
стосовно цієї проблеми найменування, "
-"а також <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">&ldquo;"
-"Користувачі GNU, які николи не чули про 
GNU&rdquo;</a>."
-
 #. type: Content of: <div><p>
-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>."
-msgstr ""
-"Цей нарис публікується в збірнику <a 
href=\"http://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Вільні програми, вільне 
суспільство: вибрані "
-"нариси Річарда М. Столмена</cite></a>."
-
-#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Names convey meanings; our choice of names determines the meaning of what "
+#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
+#| "any other name would smell as sweet&mdash;but if you call it a pen, "
+#| "people will be rather disappointed when they try to write with it.  And "
+#| "if you call pens &ldquo;roses&rdquo;, people may not realize what they "
+#| "are good for.  If you call our operating system Linux, that conveys a "
+#| "mistaken idea of the system's origin, history, and purpose.  If you call "
+#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
+#| "(though not in detail) an accurate idea."
 msgid ""
 "Names convey meanings; our choice of names determines the meaning of what we "
 "say.  An inappropriate name gives people the wrong idea.  A rose by any "
 "other name would smell as sweet&mdash;but if you call it a pen, people will "
 "be rather disappointed when they try to write with it.  And if you call pens "
-"&ldquo;roses&rdquo;, people may not realize what they are good for.  If you "
+"&ldquo;roses,&rdquo; people may not realize what they are good for.  If you "
 "call our operating system Linux, that conveys a mistaken idea of the "
 "system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
 "and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
@@ -82,6 +68,30 @@
 "уявлення."
 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+#| "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu."
+#| "html\">Linux and the GNU Project</a>, which gives a history of the GNU/"
+#| "Linux system as it relates to this issue of naming, and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>, which gives a history of the GNU/Linux "
+"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"Щоби дізнатися більше про цю проблему, ви 
можете прочитати наші <a href=\"/"
+"gnu/gnu-linux-faq.html\">&ldquo;Питання про GNU/Linux&rdquo;</a>, 
сторінку "
+"<a href=\"/gnu/linux-and-gnu.html\">&ldquo;Linux і проект 
GNU&rdquo;</a>, на "
+"якій наведена історія системи GNU/Linux 
стосовно цієї проблеми найменування, "
+"а також <a href=\"/gnu/gnu-users-never-heard-of-gnu.html\">&ldquo;"
+"Користувачі GNU, які николи не чули про 
GNU&rdquo;</a>."
+
+#. type: Content of: <div><p>
 msgid ""
 "Does this really matter for our community? Is it important whether people "
 "know the system's origin, history, and purpose? Yes&mdash;because people who "
@@ -97,7 +107,7 @@
 "Linux</a>, виживе; ми ще не повністю позбулися 
проблем, які привели нас до "
 "розробки GNU, і вони загрожують 
відновитися."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
@@ -105,7 +115,7 @@
 "Коли я пояснюю, чому правильно називати 
систему &ldquo;GNU/Linux&rdquo;, а "
 "не &ldquo;Linux&rdquo;, мені іноді відповідають 
так:"
 
-#. type: Content of: <div><div><blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "<em> Granted that the GNU Project deserves credit for this work, is it "
 "really worth a fuss when people don't give credit? Isn't the important thing "
@@ -117,7 +127,7 @@
 "виконана, а той, хто її зробив? Ви повинні 
відпочивати, пишатися добре "
 "виконаною роботою і не турбуватися про 
подяки. </em>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "This would be wise advice, if only the situation were like that&mdash;if the "
 "job were done and it were time to relax.  If only that were true! But "
@@ -134,7 +144,7 @@
 "Linux&rdquo;</a>&nbsp;&mdash; це один із способів 
нагадати собі і розповісти "
 "іншим про ці цілі."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "It is possible to write good free software without thinking of GNU; much "
 "good work has been done in the name of Linux also.  But the term &ldquo;"
@@ -149,7 +159,18 @@
 "Оскільки ця назва все більше вживається в 
комерції, у майбутньому нам буде "
 "ще важче поєднувати його з духом єдності."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "A great challenge to the future of free software comes from the tendency "
+#| "of the &ldquo;Linux&rdquo; distribution companies to add nonfree software "
+#| "to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of "
+#| "convenience and power.  All the major commercial distribution developers "
+#| "do this; none limits itself to free software.  Most of them do not "
+#| "clearly identify the nonfree packages in their distributions.  Many even "
+#| "develop nonfree software and add it to the system.  Some outrageously "
+#| "advertise &ldquo;Linux&rdquo; systems that are &ldquo;licensed per "
+#| "seat&rdquo;, which give the user as much freedom as Microsoft Windows."
 msgid ""
 "A great challenge to the future of free software comes from the tendency of "
 "the &ldquo;Linux&rdquo; distribution companies to add nonfree software to <a "
@@ -158,7 +179,7 @@
 "limits itself to free software.  Most of them do not clearly identify the "
 "nonfree packages in their distributions.  Many even develop nonfree software "
 "and add it to the system.  Some outrageously advertise &ldquo;Linux&rdquo; "
-"systems that are &ldquo;licensed per seat&rdquo;, which give the user as "
+"systems that are &ldquo;licensed per seat,&rdquo; which give the user as "
 "much freedom as Microsoft Windows."
 msgstr ""
 "Найнебезпечніша загроза майбутньому 
вільного програмного забезпечення "
@@ -172,7 +193,19 @@
 "які ліцензуються &ldquo;на окреме робоче 
місце&rdquo;, що дає користувачеві "
 "стільки ж свободи, скільки і Microsoft Windows."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "People try to justify adding nonfree software in the name of the &ldquo;"
+#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
+#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
+#| "Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;"
+#| "feels that the move toward open source software should be fueled by "
+#| "technical, rather than political, decisions.&rdquo; And Caldera's <abbr "
+#| "title=\"Chief Executive Officer\">CEO</abbr> openly urged users to <a "
+#| "href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
+#| "goal of freedom and work instead for the &ldquo;popularity of Linux&rdquo;"
+#| "</a>."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -180,7 +213,7 @@
 "said that Robert McMillan, editor of Linux Magazine, &ldquo;feels that the "
 "move toward open source software should be fueled by technical, rather than "
 "political, decisions.&rdquo; And Caldera's <abbr title=\"Chief Executive "
-"Officer\">CEO</abbr> openly urged users to <a href=\"http://www.zdnet.com/";
+"Officer\">CEO</abbr> openly urged users to <a href=\"https://www.zdnet.com/";
 "article/stallman-love-is-not-free/\">drop the goal of freedom and work "
 "instead for the &ldquo;popularity of Linux&rdquo;</a>."
 msgstr ""
@@ -195,7 +228,7 @@
 "free/\">відмовитися від свободи як мети, а 
натомість працювати над "
 "підвищенням &ldquo;популярності Linux&rdquo;</a>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -213,7 +246,7 @@
 "щось хороше і забути про цілі свободи. 
Безглуздо їхати швидше, якщо ви не "
 "можете втриматися на дорозі."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, it "
 "can become a trap for free software developers.  When they write free "
@@ -236,7 +269,7 @@
 "\"/philosophy/java-trap.html\">пастка Java</a>; на щастя, в 
даний час це в "
 "основному виправлено."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -253,7 +286,7 @@
 "користувачі очікують отримати в 
комплекті. Якщо це станеться, наш рух за "
 "свободу чекає провал."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -277,7 +310,7 @@
 "способи боротьби з запатентованими і 
секретними форматами даних, крім "
 "<strong>відмови від невільних програм, які їх 
використовують</strong>."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -294,7 +327,7 @@
 "рішучість людей, які борються за свою 
свободу і єдність&nbsp;&mdash; "
 "рішучість боротися, не припиняючи, довгі 
роки."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "In our community, this goal and this determination emanate mainly from the "
 "GNU Project.  We're the ones who talk about freedom and community as "
@@ -319,19 +352,30 @@
 "демонстрації цих програм. Головне місце, 
де люди з нашої громади можуть "
 "зустрітися з ідеєю свободи і рішучістю, 
&nbsp;&mdash; це проект GNU."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid "But when people come across it, will they feel it relates to them?"
 msgstr ""
 "Але коли люди зустрінуться з цим чи 
відчують вони, що їх це стосується?"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "People who know they are using a system that came out of the GNU Project "
+#| "can see a direct relationship between themselves and GNU.  They won't "
+#| "automatically agree with our philosophy, but at least they will see a "
+#| "reason to think seriously about it.  In contrast, people who consider "
+#| "themselves &ldquo;Linux users&rdquo;, and believe that the GNU Project "
+#| "&ldquo;developed tools which proved to be useful in Linux&rdquo;, "
+#| "typically perceive only an indirect relationship between GNU and "
+#| "themselves.  They may just ignore the GNU philosophy when they come "
+#| "across it."
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
 "automatically agree with our philosophy, but at least they will see a reason "
 "to think seriously about it.  In contrast, people who consider themselves "
-"&ldquo;Linux users&rdquo;, and believe that the GNU Project &ldquo;developed "
-"tools which proved to be useful in Linux&rdquo;, typically perceive only an "
+"&ldquo;Linux users,&rdquo; and believe that the GNU Project &ldquo;developed "
+"tools which proved to be useful in Linux,&rdquo; typically perceive only an "
 "indirect relationship between GNU and themselves.  They may just ignore the "
 "GNU philosophy when they come across it."
 msgstr ""
@@ -344,11 +388,19 @@
 "зв'язок між собою і GNU. Вони можуть просто 
проігнорувати філософію GNU, "
 "коли зустрінуться з нею."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Project is idealistic, and anyone encouraging idealism today "
+#| "faces a great obstacle: the prevailing ideology encourages people to "
+#| "dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been "
+#| "extremely practical: it is the reason we have a free <a href=\"/gnu/linux-"
+#| "and-gnu.html\">GNU/Linux</a> operating system.  People who love this "
+#| "system ought to know that it is our idealism made real."
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
-"idealism as &ldquo;impractical&rdquo;.  Our idealism has been extremely "
+"idealism as &ldquo;impractical.&rdquo; Our idealism has been extremely "
 "practical: it is the reason we have a free <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> operating system.  People who love this system ought to "
 "know that it is our idealism made real."
@@ -361,7 +413,7 @@
 "які люблять цю систему, зобов'язані знати, 
що саме наш ідеалізм втілив її в "
 "життя."
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If &ldquo;the job&rdquo; really were done, if there were nothing at stake "
 "except credit, perhaps it would be wiser to let the matter drop.  But we are "
@@ -377,6 +429,21 @@
 "допоможіть нам, називаючи цю операційну 
систему <a href=\"/gnu/linux-and-gnu."
 "html\">&ldquo;GNU/Linux&rdquo;</a>."
 
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Цей нарис був опублікований у книзі <a 
href=\"http://shop.fsf.org/product/";
+"free-software-free-society/\"><cite>Вільні програми&nbsp;&nbsp; 
вільне "
+"суспільство: Вибрані нариси Р
ічарда&nbsp;М.&nbsp;Столмена</cite></a>."
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -421,8 +488,10 @@
 "translations.html\">&ldquo;Посібнику з 
перекладу&rdquo;</a>."
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman "
 "(Річард Столмен)"
@@ -450,6 +519,15 @@
 msgstr "Оновлено:"
 
 #~ 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>."
+#~ msgstr ""
+#~ "Цей нарис публікується в збірнику <a 
href=\"http://shop.fsf.org/product/";
+#~ "free-software-free-society/\"><cite>Вільні програми, 
вільне суспільство: "
+#~ "вибрані нариси Річарда М. 
Столмена</cite></a>."
+
+#~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"
 #~ msgstr ""

Index: gnu/po/why-gnu-linux.zh-cn.po
===================================================================
RCS file: /web/www/www/gnu/po/why-gnu-linux.zh-cn.po,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gnu/po/why-gnu-linux.zh-cn.po       12 Apr 2021 07:33:48 -0000      1.8
+++ gnu/po/why-gnu-linux.zh-cn.po       30 Aug 2021 13:34:55 -0000      1.9
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: why-gnu-linux.html\n"
-"POT-Creation-Date: 2021-04-07 17:55+0000\n"
+"POT-Creation-Date: 2021-08-30 13:26+0000\n"
 "PO-Revision-Date: 2021-04-12 15:04+0800\n"
 "Last-Translator: Wensheng Xie <wxie@member.fsf.org>\n"
 "Language-Team: Chinese <www-zh-cn-translators@gnu.org>\n"
@@ -14,51 +14,39 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Outdated-Since: 2021-08-30 13:26+0000\n"
 
 #. type: Content of: <title>
 msgid "Why GNU/Linux? - GNU Project - Free Software Foundation"
 msgstr "为什么应该是 GNU/Linux? - GNU 工程 - 自由软件基金会"
 
-#. type: Content of: <h2>
+#. type: Content of: <div><h2>
 msgid "What's in a Name?"
 msgstr "名字里应该有什么?"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"https://www.stallman.org/\";>理查德·斯托曼</a> 著"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
-"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
-"\">Linux and the GNU Project</a>, which gives a history of the GNU/Linux "
-"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
-"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
-"a>."
-msgstr ""
-"如需了解此问题的更多信息,你可以阅读我们的<a 
href=\"/gnu/gnu-linux-faq.html"
-"\">GNU/Linux问答</a>、我们关于<a 
href=\"/gnu/linux-and-gnu.html\">Linux和GNU"
-"工程</a>的页面(å…
¶ä¸­ç»™å‡ºäº†GNU/Linux系统的历史,这个和命名问题相å…
³ï¼‰ä»¥åŠæˆ‘们关"
-"于<a 
href=\"/gnu/gnu-users-never-heard-of-gnu.html\">从未听说过GNU的GNU用户</"
-"a>页面。"
-
 #. type: Content of: <div><p>
-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>."
-msgstr ""
-"本文发表于<a 
href=\"http://shop.fsf.org/product/free-software-free-society/";
-"\"> <cite>自由软件,自由社会:Richard M. 
Stallman选集</cite></a>一书。"
-
-#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "Names convey meanings; our choice of names determines the meaning of what "
+#| "we say.  An inappropriate name gives people the wrong idea.  A rose by "
+#| "any other name would smell as sweet&mdash;but if you call it a pen, "
+#| "people will be rather disappointed when they try to write with it.  And "
+#| "if you call pens &ldquo;roses&rdquo;, people may not realize what they "
+#| "are good for.  If you call our operating system Linux, that conveys a "
+#| "mistaken idea of the system's origin, history, and purpose.  If you call "
+#| "it <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>, that conveys "
+#| "(though not in detail) an accurate idea."
 msgid ""
 "Names convey meanings; our choice of names determines the meaning of what we "
 "say.  An inappropriate name gives people the wrong idea.  A rose by any "
 "other name would smell as sweet&mdash;but if you call it a pen, people will "
 "be rather disappointed when they try to write with it.  And if you call pens "
-"&ldquo;roses&rdquo;, people may not realize what they are good for.  If you "
+"&ldquo;roses,&rdquo; people may not realize what they are good for.  If you "
 "call our operating system Linux, that conveys a mistaken idea of the "
 "system's origin, history, and purpose.  If you call it <a href=\"/gnu/linux-"
 "and-gnu.html\">GNU/Linux</a>, that conveys (though not in detail) an "
@@ -73,6 +61,29 @@
 "的观念。"
 
 #. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+#| "faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu."
+#| "html\">Linux and the GNU Project</a>, which gives a history of the GNU/"
+#| "Linux system as it relates to this issue of naming, and our page on <a "
+#| "href=\"/gnu/gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never "
+#| "Heard of GNU</a>."
+msgid ""
+"To learn more about this issue, you can read our <a href=\"/gnu/gnu-linux-"
+"faq.html\">GNU/Linux FAQ</a>, our page on <a href=\"/gnu/linux-and-gnu.html"
+"\">Linux and the GNU System</a>, which gives a history of the GNU/Linux "
+"system as it relates to this issue of naming, and our page on <a href=\"/gnu/"
+"gnu-users-never-heard-of-gnu.html\">GNU Users Who Have Never Heard of GNU</"
+"a>."
+msgstr ""
+"如需了解此问题的更多信息,你可以阅读我们的<a 
href=\"/gnu/gnu-linux-faq.html"
+"\">GNU/Linux问答</a>、我们关于<a 
href=\"/gnu/linux-and-gnu.html\">Linux和GNU"
+"工程</a>的页面(å…
¶ä¸­ç»™å‡ºäº†GNU/Linux系统的历史,这个和命名问题相å…
³ï¼‰ä»¥åŠæˆ‘们关"
+"于<a 
href=\"/gnu/gnu-users-never-heard-of-gnu.html\">从未听说过GNU的GNU用户</"
+"a>页面。"
+
+#. type: Content of: <div><p>
 msgid ""
 "Does this really matter for our community? Is it important whether people "
 "know the system's origin, history, and purpose? Yes&mdash;because people who "
@@ -86,7 +97,7 @@
 "\">GNU/Linux</a>建立起来的自由世界并不保证一定会流传
下去;促使我们开发GNU的麻"
 "烦并未根除,而且它们扬言要卷土重来。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When I explain why it's appropriate to call the operating system GNU/Linux "
 "rather than Linux, people sometimes respond this way:"
@@ -94,7 +105,7 @@
 
"当我向人们解释为什么称该系统为GNU/Linux而不是Linux是恰当的时候,他们有时这æ
 ·"
 "回应:"
 
-#. type: Content of: <div><div><blockquote><p>
+#. type: Content of: <div><blockquote><p>
 msgid ""
 "<em> Granted that the GNU Project deserves credit for this work, is it "
 "really worth a fuss when people don't give credit? Isn't the important thing "
@@ -105,7 +116,7 @@
 "是工作完成了,而是谁完成的?你
应该放松,为漂亮地完成工作而自豪,而不是去担心"
 "有没有获得荣誉。</em>"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "This would be wise advice, if only the situation were like that&mdash;if the "
 "job were done and it were time to relax.  If only that were true! But "
@@ -119,7 +130,7 @@
 "由和合作的承诺。使用<a 
href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a>这个名字"
 "就是人们提醒自己和告知他人这些目标的一种手段。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "It is possible to write good free software without thinking of GNU; much "
 "good work has been done in the name of Linux also.  But the term &ldquo;"
@@ -133,7 +144,18 @@
 
"由合作。随着这一名称越来越多地被商业界使用,我们越来越难以把它和我们的社区精"
 "神联系在一起。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "A great challenge to the future of free software comes from the tendency "
+#| "of the &ldquo;Linux&rdquo; distribution companies to add nonfree software "
+#| "to <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> in the name of "
+#| "convenience and power.  All the major commercial distribution developers "
+#| "do this; none limits itself to free software.  Most of them do not "
+#| "clearly identify the nonfree packages in their distributions.  Many even "
+#| "develop nonfree software and add it to the system.  Some outrageously "
+#| "advertise &ldquo;Linux&rdquo; systems that are &ldquo;licensed per "
+#| "seat&rdquo;, which give the user as much freedom as Microsoft Windows."
 msgid ""
 "A great challenge to the future of free software comes from the tendency of "
 "the &ldquo;Linux&rdquo; distribution companies to add nonfree software to <a "
@@ -142,7 +164,7 @@
 "limits itself to free software.  Most of them do not clearly identify the "
 "nonfree packages in their distributions.  Many even develop nonfree software "
 "and add it to the system.  Some outrageously advertise &ldquo;Linux&rdquo; "
-"systems that are &ldquo;licensed per seat&rdquo;, which give the user as "
+"systems that are &ldquo;licensed per seat,&rdquo; which give the user as "
 "much freedom as Microsoft Windows."
 msgstr ""
 "自由软件的未来的一个巨大挑战来自发行&ldquo;Linux&rdquo;的å…
¬å¸ä»¥ä¾¿åˆ©å’ŒåŠŸèƒ½å¼ºå¤§"
@@ -152,7 +174,19 @@
 "加到系统中。还有些悍然宣传
&ldquo;Linux&rdquo;系统是&ldquo;按用户数授权的"
 "&rdquo;,就是和Microsoft Windows给用户的自由一样多。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "People try to justify adding nonfree software in the name of the &ldquo;"
+#| "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
+#| "freedom.  Sometimes this is openly admitted.  For instance, Wired "
+#| "Magazine said that Robert McMillan, editor of Linux Magazine, &ldquo;"
+#| "feels that the move toward open source software should be fueled by "
+#| "technical, rather than political, decisions.&rdquo; And Caldera's <abbr "
+#| "title=\"Chief Executive Officer\">CEO</abbr> openly urged users to <a "
+#| "href=\"http://www.zdnet.com/article/stallman-love-is-not-free/\";>drop the "
+#| "goal of freedom and work instead for the &ldquo;popularity of Linux&rdquo;"
+#| "</a>."
 msgid ""
 "People try to justify adding nonfree software in the name of the &ldquo;"
 "popularity of Linux&rdquo;&mdash;in effect, valuing popularity above "
@@ -160,7 +194,7 @@
 "said that Robert McMillan, editor of Linux Magazine, &ldquo;feels that the "
 "move toward open source software should be fueled by technical, rather than "
 "political, decisions.&rdquo; And Caldera's <abbr title=\"Chief Executive "
-"Officer\">CEO</abbr> openly urged users to <a href=\"http://www.zdnet.com/";
+"Officer\">CEO</abbr> openly urged users to <a href=\"https://www.zdnet.com/";
 "article/stallman-love-is-not-free/\">drop the goal of freedom and work "
 "instead for the &ldquo;popularity of Linux&rdquo;</a>."
 msgstr ""
@@ -172,7 +206,7 @@
 "stallman-love-is-not-free/\">丢弃自由的目æ 
‡ï¼Œè½¬è€Œä¸º&ldquo;Linux的流行&rdquo;"
 "而工作</a>。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Adding nonfree software to the <a href=\"/gnu/linux-and-gnu.html\">GNU/"
 "Linux</a> system may increase the popularity, if by popularity we mean the "
@@ -187,7 +221,7 @@
 "a>软件加
上某些非自由软件的人数。但是同时,它暗示着鼓励社区象接受一件好事一æ
 ·"
 "接受非自由软件,并忘却自由的目æ 
‡ã€‚如果南辕北辙,走得再快也不是好事。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "When the nonfree &ldquo;add-on&rdquo; is a library or programming tool, it "
 "can become a trap for free software developers.  When they write free "
@@ -206,7 +240,7 @@
 "得以完全消除。后来,Sun公司的非自由Java实现具有同æ 
·çš„效果:<a href=\"/"
 
"philosophy/java-trap.html\">Java陷阱</a>,幸运的是,现在大多数问题都修正了。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If our community keeps moving in this direction, it could redirect the "
 "future of <a href=\"/gnu/linux-and-gnu.html\">GNU/Linux</a> into a mosaic of "
@@ -220,7 +254,7 @@
 
"有很多自由软件;但是如果我们不注意,GNU/Linux将变得如果用户找不到å
…¶æœŸå¾…的非自"
 "由软件的话就基本无法使用。如果出现这种情
况,我们的自由运动就失败了。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If releasing free alternatives were simply a matter of programming, solving "
 "future problems might become easier as our community's development resources "
@@ -239,7 +273,7 @@
 
"重要活动的自由软件的法律的应用,我们会发现除了<strong>拒绝使用非自由软件</"
 
"strong>之外,我们没有明确的办法来对付这些专利和保密数据æ
 ¼å¼ã€‚"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "Meeting these challenges will require many different kinds of effort.  But "
 "what we need above all, to confront any kind of challenge, is to remember "
@@ -254,7 +288,7 @@
 
"的努力。我们需要的是人们在为自由和社区战斗时所展现的决心&mdash;能够持续多年而"
 "不放弃的决心。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "In our community, this goal and this determination emanate mainly from the "
 "GNU Project.  We're the ones who talk about freedom and community as "
@@ -275,18 +309,29 @@
 
"支持Linux&rdquo;;&ldquo;Linux&rdquo;用户组往往会邀请宣讲这些解决方案的推销"
 
"商。社区中人们有可能碰到自由和决心的地方主要就是GNU工程。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid "But when people come across it, will they feel it relates to them?"
 msgstr "但是当人们碰到它时,他们会觉得它和自己有关吗?"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "People who know they are using a system that came out of the GNU Project "
+#| "can see a direct relationship between themselves and GNU.  They won't "
+#| "automatically agree with our philosophy, but at least they will see a "
+#| "reason to think seriously about it.  In contrast, people who consider "
+#| "themselves &ldquo;Linux users&rdquo;, and believe that the GNU Project "
+#| "&ldquo;developed tools which proved to be useful in Linux&rdquo;, "
+#| "typically perceive only an indirect relationship between GNU and "
+#| "themselves.  They may just ignore the GNU philosophy when they come "
+#| "across it."
 msgid ""
 "People who know they are using a system that came out of the GNU Project can "
 "see a direct relationship between themselves and GNU.  They won't "
 "automatically agree with our philosophy, but at least they will see a reason "
 "to think seriously about it.  In contrast, people who consider themselves "
-"&ldquo;Linux users&rdquo;, and believe that the GNU Project &ldquo;developed "
-"tools which proved to be useful in Linux&rdquo;, typically perceive only an "
+"&ldquo;Linux users,&rdquo; and believe that the GNU Project &ldquo;developed "
+"tools which proved to be useful in Linux,&rdquo; typically perceive only an "
 "indirect relationship between GNU and themselves.  They may just ignore the "
 "GNU philosophy when they come across it."
 msgstr ""
@@ -296,11 +341,19 @@
 
"&rdquo;的人们,往往只是意识到自己和GNU的非直接联系。在碰到GNU的哲学之时,他们"
 "很可能就是轻轻略过。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
+#, fuzzy
+#| msgid ""
+#| "The GNU Project is idealistic, and anyone encouraging idealism today "
+#| "faces a great obstacle: the prevailing ideology encourages people to "
+#| "dismiss idealism as &ldquo;impractical&rdquo;.  Our idealism has been "
+#| "extremely practical: it is the reason we have a free <a href=\"/gnu/linux-"
+#| "and-gnu.html\">GNU/Linux</a> operating system.  People who love this "
+#| "system ought to know that it is our idealism made real."
 msgid ""
 "The GNU Project is idealistic, and anyone encouraging idealism today faces a "
 "great obstacle: the prevailing ideology encourages people to dismiss "
-"idealism as &ldquo;impractical&rdquo;.  Our idealism has been extremely "
+"idealism as &ldquo;impractical.&rdquo; Our idealism has been extremely "
 "practical: it is the reason we have a free <a href=\"/gnu/linux-and-gnu.html"
 "\">GNU/Linux</a> operating system.  People who love this system ought to "
 "know that it is our idealism made real."
@@ -310,7 +363,7 @@
 "是因为实际,我们有了一个自由的<a 
href=\"/gnu/linux-and-gnu.html\">GNU/Linux</"
 
"a>操作系统。喜爱这个系统的人们应该了解正是我们的理想主义使该系统成为现实。"
 
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><p>
 msgid ""
 "If &ldquo;the job&rdquo; really were done, if there were nothing at stake "
 "except credit, perhaps it would be wiser to let the matter drop.  But we are "
@@ -324,6 +377,20 @@
 "可我们已经完成的工作。请帮助我们,请称该操作系统为<a 
href=\"/gnu/linux-and-"
 "gnu.html\">GNU/Linux</a>。"
 
+#. type: Content of: <div><div><p>
+#, fuzzy
+#| msgid ""
+#| "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>."
+msgid ""
+"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 ""
+"本文发表于<a 
href=\"https://shop.fsf.org/product/free-software-free-society/";
+"\"><cite>自由软件、自由社会:理查德.M.斯托曼 
选集</cite></a>。"
+
 #. TRANSLATORS: Use space (SPC) as msgstr if you don't have notes.
 #. type: Content of: <div>
 msgid "*GNUN-SLOT: TRANSLATOR'S NOTES*"
@@ -364,8 +431,10 @@
 "解有关协调和提交文章翻译的信息。"
 
 #. type: Content of: <div><p>
-msgid ""
-"Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+#, fuzzy
+#| msgid ""
+#| "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
+msgid "Copyright &copy; 2000, 2007, 2021 Richard Stallman"
 msgstr ""
 "Copyright &copy; 2000, 2006, 2007, 2014-2016, 2020, 2021 Richard Stallman"
 
@@ -394,6 +463,15 @@
 msgstr "最后更新:"
 
 #~ 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>."
+#~ msgstr ""
+#~ "本文发表于<a href=\"http://shop.fsf.org/product/free-software-free-";
+#~ "society/\"> <cite>自由软件,自由社会:Richard M. 
Stallman选集</cite></a>一"
+#~ "书。"
+
+#~ msgid ""
 #~ "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 #~ "strong>"
 #~ msgstr ""

Index: server/gnun/compendia/compendium.af.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.af.po,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- server/gnun/compendia/compendium.af.po      28 Aug 2021 14:06:17 -0000      
1.127
+++ server/gnun/compendia/compendium.af.po      30 Aug 2021 13:34:55 -0000      
1.128
@@ -199,13 +199,13 @@
 msgstr ""
 
 # type: Content of: <body><div><div><div><ul><li>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 #, fuzzy
 #| msgid "<a href=\"http://www.fsf.org/\";>Free Software Foundation</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"http://www.fsf.org/\";>Free Software Foundation</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr ""
 
@@ -217,6 +217,13 @@
 "by <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></a>"
 msgstr "<a href=\"http://www.fsf.org/\";>Free Software Foundation</a>"
 
+#. type: Content of: <div><div><p>
+msgid ""
+"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 ""
+
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
@@ -256,13 +263,6 @@
 msgid "Copyright notice above."
 msgstr ""
 
-#. type: Content of: <div><div><p>
-msgid ""
-"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 ""
-
 # type: Content of: <div><p>
 #. type: Content of: <blockquote><p>
 #, fuzzy

Index: server/gnun/compendia/compendium.ar.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ar.po,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- server/gnun/compendia/compendium.ar.po      28 Aug 2021 14:06:17 -0000      
1.132
+++ server/gnun/compendia/compendium.ar.po      30 Aug 2021 13:34:55 -0000      
1.133
@@ -196,11 +196,11 @@
 "</a>&nbsp;\\ <a href=\"/education/education.html\">تعليم</a>&nbsp;\\ <a 
href="
 "\"/education/edu-resources.html\">مصادر التعليم</a>&nbsp;\\"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "بقلم <a href=\"https://www.stallman.org/\";>ريتشارد 
ستولمن</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "هوامش"
 
@@ -211,6 +211,25 @@
 "من قبل <a href=\"http://www.stallman.org/\";><strong>ريشارد 
ستالمان</strong></"
 "a>"
 
+# | 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>.
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"نُشرت هذه المقالة في <a 
href=\"http://shop.fsf.org/product/free-software-free-";
+"society/\"><cite>برمجيات حرة، مجتمع حر: مقالات م
ختارة بقلم ريتشارد ستولمن</"
+"cite></a>."
+
 # type: Content of: <div><p>
 # | {+<em>Page text:</em>&nbsp;+} Copyright &copy; [-2004, 2005, 2006, 2007,
 # | 2008, 2009-] {+2019, 2020+} Free Software Foundation, Inc.
@@ -267,25 +286,6 @@
 msgid "Copyright notice above."
 msgstr "ملاحظة حقوق النشر أعلاه."
 
-# | 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>.
-#. type: Content of: <div><div><p>
-#, 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=\"https://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Free Software, Free Society: The Selected "
-"Essays of Richard M. Stallman</cite></a>."
-msgstr ""
-"نُشرت هذه المقالة في <a 
href=\"http://shop.fsf.org/product/free-software-free-";
-"society/\"><cite>برمجيات حرة، مجتمع حر: مقالات م
ختارة بقلم ريتشارد ستولمن</"
-"cite></a>."
-
 #. type: Content of: <blockquote><p>
 #, fuzzy
 #| msgid "The Free Software Foundation"

Index: server/gnun/compendia/compendium.bg.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.bg.po,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -b -r1.133 -r1.134
--- server/gnun/compendia/compendium.bg.po      28 Aug 2021 14:06:17 -0000      
1.133
+++ server/gnun/compendia/compendium.bg.po      30 Aug 2021 13:34:55 -0000      
1.134
@@ -205,11 +205,11 @@
 "\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "от <a href=\"https://www.stallman.org/\";>Ричард 
Столман</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Бележки"
 
@@ -219,6 +219,25 @@
 msgstr ""
 "от <a href=\"http://www.stallman.org/\";><strong>Ричард 
Столман</strong></a>"
 
+# | 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>.
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Това есе е публикувано в книгата <a 
href=\"http://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Свободен софтуер, 
свободно общество: избрани "
+"есета от Ричард М. Столман</cite></a>."
+
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
@@ -262,25 +281,6 @@
 msgid "Copyright notice above."
 msgstr ""
 
-# | 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>.
-#. type: Content of: <div><div><p>
-#, 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=\"https://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Free Software, Free Society: The Selected "
-"Essays of Richard M. Stallman</cite></a>."
-msgstr ""
-"Това есе е публикувано в книгата <a 
href=\"http://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Свободен софтуер, 
свободно общество: избрани "
-"есета от Ричард М. Столман</cite></a>."
-
 #. type: Content of: <blockquote><p>
 #, fuzzy
 #| msgid "Linux and GNU - GNU Project - Free Software Foundation"

Index: server/gnun/compendia/compendium.ca.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ca.po,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -b -r1.135 -r1.136
--- server/gnun/compendia/compendium.ca.po      28 Aug 2021 14:06:18 -0000      
1.135
+++ server/gnun/compendia/compendium.ca.po      30 Aug 2021 13:34:55 -0000      
1.136
@@ -209,12 +209,12 @@
 "</a>&nbsp;/ <a href=\"/education/education.html\">Educació</a>&nbsp;/ <a "
 "href=\"/education/education.html#indepth\">A fons</a>&nbsp;/"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "per <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Notes"
 
@@ -226,6 +226,25 @@
 "per <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></"
 "a>"
 
+# | 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>.
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Aquest assaig s'ha publicat al llibre <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>."
+
 # | {+<em>Page text:</em>&nbsp;+} Copyright &copy; [-2014-] {+2019, 2020+}
 # | Free Software Foundation, Inc.
 #. type: Content of: <div><p>
@@ -306,25 +325,6 @@
 msgid "Copyright notice above."
 msgstr "Nota de copyright a sobre."
 
-# | 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>.
-#. type: Content of: <div><div><p>
-#, 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=\"https://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Free Software, Free Society: The Selected "
-"Essays of Richard M. Stallman</cite></a>."
-msgstr ""
-"Aquest assaig s'ha publicat al llibre <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>."
-
 # type: Content of: <h3>
 #. type: Content of: <blockquote><p>
 #, fuzzy

Index: server/gnun/compendia/compendium.cs.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.cs.po,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -b -r1.131 -r1.132
--- server/gnun/compendia/compendium.cs.po      28 Aug 2021 14:06:18 -0000      
1.131
+++ server/gnun/compendia/compendium.cs.po      30 Aug 2021 13:34:55 -0000      
1.132
@@ -207,11 +207,11 @@
 "</a>&nbsp;/ <a href=\"/education/education.html\">Vzdělávání</a>&nbsp;/ 
<a "
 "href=\"/education/education.html#indepth\">Podrobně</a>&nbsp;/"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "od <a href=\"https://www.stallman.org/\";>Richarda Stallmana</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Poznámky pod čarou"
 
@@ -223,6 +223,25 @@
 "od <a href=\"http://www.stallman.org/\";><strong>Richarda Stallmana</strong></"
 "a>"
 
+# | 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>.
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Tato esej vyšla v knize <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>."
+
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "Copyright &copy; 2011 Free Software Foundation, Inc."
@@ -266,25 +285,6 @@
 msgid "Copyright notice above."
 msgstr "Autorská práva: viz výše."
 
-# | 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>.
-#. type: Content of: <div><div><p>
-#, 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=\"https://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Free Software, Free Society: The Selected "
-"Essays of Richard M. Stallman</cite></a>."
-msgstr ""
-"Tato esej vyšla v knize <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>."
-
 #. type: Content of: <blockquote><p>
 #, fuzzy
 #| msgid "The Free Software Foundation"

Index: server/gnun/compendia/compendium.da.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.da.po,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- server/gnun/compendia/compendium.da.po      28 Aug 2021 14:06:18 -0000      
1.72
+++ server/gnun/compendia/compendium.da.po      30 Aug 2021 13:34:55 -0000      
1.73
@@ -177,7 +177,7 @@
 # | by <a [-href=\"http://www.stallman.org/\";><strong>Richard
 # | Stallman</strong></a>-] {+href=\"https://www.stallman.org/\";>Richard
 # | Stallman</a>+}
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 #, fuzzy
 #| msgid ""
 #| "by <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</"
@@ -186,7 +186,7 @@
 msgstr ""
 "af <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr ""
 
@@ -196,6 +196,13 @@
 msgstr ""
 "af <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></a>"
 
+#. type: Content of: <div><div><p>
+msgid ""
+"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 ""
+
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
@@ -233,13 +240,6 @@
 msgid "Copyright notice above."
 msgstr ""
 
-#. type: Content of: <div><div><p>
-msgid ""
-"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 ""
-
 #. type: Content of: <blockquote><p>
 msgid "Media Contact: Free Software Foundation"
 msgstr ""

Index: server/gnun/compendia/compendium.de.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.de.po,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -b -r1.181 -r1.182
--- server/gnun/compendia/compendium.de.po      28 Aug 2021 14:06:18 -0000      
1.181
+++ server/gnun/compendia/compendium.de.po      30 Aug 2021 13:34:55 -0000      
1.182
@@ -200,11 +200,11 @@
 "</a>&nbsp;/ <a href=\"/education/\">Bildung</a>&nbsp;/ <a href=\"/education/"
 "edu-resources\">Ressourcen</a>&nbsp;/"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "von <a href=\"//www.stallman.org/\">Richard Stallman</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Fußnoten"
 
@@ -214,6 +214,26 @@
 msgstr ""
 "von <strong><a href=\"//www.stallman.org/\">Richard Stallman</a></strong>"
 
+# | 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>.
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Dieser Aufsatz wurde englischsprachig in <cite><a href=\"//shop.fsf.org/"
+"product/free-software-free-society/\" xml:lang=\"en\" lang=\"en\">Free "
+"Software, Free Society: The Selected Essays of Richard M. Stallman</a></"
+"cite> veröffentlicht."
+
 # | {+<em>Page text:</em>&nbsp;+} Copyright &copy; [-2014-] {+2019, 2020+}
 # | Free Software Foundation, Inc.
 #. type: Content of: <div><p>
@@ -260,26 +280,6 @@
 msgid "Copyright notice above."
 msgstr "Urheberrechtsvermerk siehe oben."
 
-# | 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>.
-#. type: Content of: <div><div><p>
-#, 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=\"https://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Free Software, Free Society: The Selected "
-"Essays of Richard M. Stallman</cite></a>."
-msgstr ""
-"Dieser Aufsatz wurde englischsprachig in <cite><a href=\"//shop.fsf.org/"
-"product/free-software-free-society/\" xml:lang=\"en\" lang=\"en\">Free "
-"Software, Free Society: The Selected Essays of Richard M. Stallman</a></"
-"cite> veröffentlicht."
-
 #. type: Content of: <blockquote><p>
 msgid "Media Contact: Free Software Foundation"
 msgstr "Medienkontakt: Free Software Foundation"

Index: server/gnun/compendia/compendium.el.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.el.po,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -b -r1.137 -r1.138
--- server/gnun/compendia/compendium.el.po      28 Aug 2021 14:06:19 -0000      
1.137
+++ server/gnun/compendia/compendium.el.po      30 Aug 2021 13:34:55 -0000      
1.138
@@ -199,11 +199,11 @@
 "</a>&nbsp;/ <a href=\"/education/education.html\">Εκπαίδευ
ση</a>&nbsp;/ <a "
 "href=\"/education/edu-resources.html\">Πόροι</a>&nbsp;/"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "από τον <a href=\"https://www.stallman.org/\";>Richard 
Stallman</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Υποσημειώσεις"
 
@@ -214,6 +214,25 @@
 "από τον <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</"
 "strong></a>"
 
+# | 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>.
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Αυτό το δοκίμιο δημοσιεύεται στην <a 
href=\"http://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Ελεύθερο Λογισμικό, 
Ελεύθερη Κοινωνία: Tα "
+"Επιλεγμένα Δοκίμια του Richard M. Stallman</cite></a>."
+
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "Copyright &copy; 2019-2021 Free Software Foundation, Inc."
@@ -264,25 +283,6 @@
 msgid "Copyright notice above."
 msgstr "Ειδοποίηση πνευματικών δικαιωμάτων 
παραπάνω."
 
-# | 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>.
-#. type: Content of: <div><div><p>
-#, 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=\"https://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Free Software, Free Society: The Selected "
-"Essays of Richard M. Stallman</cite></a>."
-msgstr ""
-"Αυτό το δοκίμιο δημοσιεύεται στην <a 
href=\"http://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Ελεύθερο Λογισμικό, 
Ελεύθερη Κοινωνία: Tα "
-"Επιλεγμένα Δοκίμια του Richard M. Stallman</cite></a>."
-
 # type: Content of: <h3>
 #. type: Content of: <blockquote><p>
 msgid "Media Contact: Free Software Foundation"

Index: server/gnun/compendia/compendium.eo.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.eo.po,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/gnun/compendia/compendium.eo.po      28 Aug 2021 14:06:19 -0000      
1.17
+++ server/gnun/compendia/compendium.eo.po      30 Aug 2021 13:34:55 -0000      
1.18
@@ -180,11 +180,11 @@
 "\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr ""
 
@@ -193,6 +193,13 @@
 "by <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></a>"
 msgstr ""
 
+#. type: Content of: <div><div><p>
+msgid ""
+"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 ""
+
 #. type: Content of: <div><p>
 msgid ""
 "<em>Page text:</em>&nbsp; Copyright &copy; 2019, 2020 Free Software "
@@ -224,13 +231,6 @@
 msgid "Copyright notice above."
 msgstr ""
 
-#. type: Content of: <div><div><p>
-msgid ""
-"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 ""
-
 #. type: Content of: <blockquote><p>
 msgid "Media Contact: Free Software Foundation"
 msgstr ""

Index: server/gnun/compendia/compendium.es.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.es.po,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -b -r1.140 -r1.141
--- server/gnun/compendia/compendium.es.po      28 Aug 2021 14:06:19 -0000      
1.140
+++ server/gnun/compendia/compendium.es.po      30 Aug 2021 13:34:55 -0000      
1.141
@@ -204,12 +204,12 @@
 "href=\"/music/music.html#content\">Música</a>&nbsp;/"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "por <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Notas al pie"
 
@@ -221,6 +221,16 @@
 "por <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></"
 "a>"
 
+#. type: Content of: <div><div><p>
+msgid ""
+"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 ""
+"Este ensayo está publicado en el libro <a href=\"https://shop.fsf.org/";
+"product/free-software-free-society/\"><cite>Software libre para una sociedad "
+"libre: Selección de ensayos de Richard M. Stallman</cite></a>."
+
 #. type: Content of: <div><p>
 msgid ""
 "<em>Page text:</em>&nbsp; Copyright &copy; 2019, 2020 Free Software "
@@ -269,16 +279,6 @@
 msgid "Copyright notice above."
 msgstr "La nota sobre el copyright se encuentra más arriba."
 
-#. type: Content of: <div><div><p>
-msgid ""
-"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 ""
-"Este ensayo está publicado en el libro <a href=\"https://shop.fsf.org/";
-"product/free-software-free-society/\"><cite>Software libre para una sociedad "
-"libre: Selección de ensayos de Richard M. Stallman</cite></a>."
-
 # type: Content of: <h3>
 #. type: Content of: <blockquote><p>
 #, fuzzy

Index: server/gnun/compendia/compendium.fa.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.fa.po,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- server/gnun/compendia/compendium.fa.po      28 Aug 2021 14:06:19 -0000      
1.129
+++ server/gnun/compendia/compendium.fa.po      30 Aug 2021 13:34:55 -0000      
1.130
@@ -220,14 +220,14 @@
 msgstr ""
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 #, fuzzy
 #| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "نوشتهٔ <a href=\"http://www.stallman.org/\";>ریچارد 
استالمن</a>"
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr ""
 
@@ -239,6 +239,21 @@
 "نوشتهٔ <a href=\"http://www.stallman.org/\";><strong>ریچارد 
استالمن</strong></"
 "a>"
 
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"این مقاله در <a 
href=\"http://shop.fsf.org/product/free-software-free-";
+"society/\"><cite>نرم‌افزار آزاد، جامعه آزاد: م
قالات منتخب ریچارد استالمن</"
+"cite></a> منتشر شده‌است."
+
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
@@ -286,21 +301,6 @@
 msgid "Copyright notice above."
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#, 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=\"https://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Free Software, Free Society: The Selected "
-"Essays of Richard M. Stallman</cite></a>."
-msgstr ""
-"این مقاله در <a 
href=\"http://shop.fsf.org/product/free-software-free-";
-"society/\"><cite>نرم‌افزار آزاد، جامعه آزاد: م
قالات منتخب ریچارد استالمن</"
-"cite></a> منتشر شده‌است."
-
 # type: Content of: <title>
 #. type: Content of: <blockquote><p>
 #, fuzzy

Index: server/gnun/compendia/compendium.fi.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.fi.po,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- server/gnun/compendia/compendium.fi.po      28 Aug 2021 14:06:19 -0000      
1.36
+++ server/gnun/compendia/compendium.fi.po      30 Aug 2021 13:34:55 -0000      
1.37
@@ -192,7 +192,7 @@
 msgstr ""
 
 # | by <a href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 #, fuzzy
 #| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
@@ -200,7 +200,7 @@
 "tehnyt <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</"
 "strong></a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Viittet"
 
@@ -210,6 +210,25 @@
 msgstr ""
 "<a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></a>"
 
+# | 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>.
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Tämä essee on julkaistu teoksessa <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>."
+
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
@@ -247,25 +266,6 @@
 msgid "Copyright notice above."
 msgstr ""
 
-# | 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>.
-#. type: Content of: <div><div><p>
-#, 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=\"https://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Free Software, Free Society: The Selected "
-"Essays of Richard M. Stallman</cite></a>."
-msgstr ""
-"Tämä essee on julkaistu teoksessa <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>."
-
 #. type: Content of: <blockquote><p>
 msgid "Media Contact: Free Software Foundation"
 msgstr ""

Index: server/gnun/compendia/compendium.fr.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.fr.po,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -b -r1.138 -r1.139
--- server/gnun/compendia/compendium.fr.po      28 Aug 2021 14:06:19 -0000      
1.138
+++ server/gnun/compendia/compendium.fr.po      30 Aug 2021 13:34:55 -0000      
1.139
@@ -193,11 +193,11 @@
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">Humour GNU</a>&nbsp;/ <a "
 "href=\"/fun/humor.html#Computing\">Informatique</a>&nbsp;/"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "par <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Notes"
 
@@ -208,6 +208,16 @@
 "par <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></"
 "a>"
 
+#. type: Content of: <div><div><p>
+msgid ""
+"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 ""
+"Cet article est publié dans le livre <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>."
+
 #. type: Content of: <div><p>
 msgid ""
 "<em>Page text:</em>&nbsp; Copyright &copy; 2019, 2020 Free Software "
@@ -251,16 +261,6 @@
 msgid "Copyright notice above."
 msgstr "Voir ci-dessus l'avis de copyright."
 
-#. type: Content of: <div><div><p>
-msgid ""
-"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 ""
-"Cet article est publié dans le livre <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>."
-
 #. type: Content of: <blockquote><p>
 msgid "Media Contact: Free Software Foundation"
 msgstr "Contact presse : Free Software Foundation"

Index: server/gnun/compendia/compendium.he.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.he.po,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- server/gnun/compendia/compendium.he.po      28 Aug 2021 14:06:19 -0000      
1.127
+++ server/gnun/compendia/compendium.he.po      30 Aug 2021 13:34:55 -0000      
1.128
@@ -173,11 +173,11 @@
 "\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr ""
 
@@ -186,6 +186,13 @@
 "by <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></a>"
 msgstr ""
 
+#. type: Content of: <div><div><p>
+msgid ""
+"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 ""
+
 #. type: Content of: <div><p>
 msgid ""
 "<em>Page text:</em>&nbsp; Copyright &copy; 2019, 2020 Free Software "
@@ -217,13 +224,6 @@
 msgid "Copyright notice above."
 msgstr ""
 
-#. type: Content of: <div><div><p>
-msgid ""
-"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 ""
-
 #. type: Content of: <blockquote><p>
 msgid "Media Contact: Free Software Foundation"
 msgstr ""

Index: server/gnun/compendia/compendium.hr.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.hr.po,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- server/gnun/compendia/compendium.hr.po      28 Aug 2021 14:06:19 -0000      
1.111
+++ server/gnun/compendia/compendium.hr.po      30 Aug 2021 13:34:55 -0000      
1.112
@@ -219,11 +219,11 @@
 "</a>&nbsp;/ <a href=\"/education/education.html\">Obrazovanje</a>&nbsp;/ <a "
 "href=\"/education/edu-resources.html\">Resursi</a>&nbsp;/"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "napisao <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Fusnote."
 
@@ -233,6 +233,25 @@
 msgstr ""
 "<a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></a>"
 
+# | 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>.
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Ovaj esej je objavljen u <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>."
+
 # | {+<em>Page text:</em>&nbsp;+} Copyright &copy; [-2014-] {+2019, 2020+}
 # | Free Software Foundation, Inc.
 #. type: Content of: <div><p>
@@ -301,25 +320,6 @@
 msgid "Copyright notice above."
 msgstr ""
 
-# | 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>.
-#. type: Content of: <div><div><p>
-#, 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=\"https://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Free Software, Free Society: The Selected "
-"Essays of Richard M. Stallman</cite></a>."
-msgstr ""
-"Ovaj esej je objavljen u <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>."
-
 #. type: Content of: <blockquote><p>
 #, fuzzy
 #| msgid "The Free Software Foundation"

Index: server/gnun/compendia/compendium.id.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.id.po,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- server/gnun/compendia/compendium.id.po      28 Aug 2021 14:06:19 -0000      
1.128
+++ server/gnun/compendia/compendium.id.po      30 Aug 2021 13:34:55 -0000      
1.129
@@ -227,7 +227,7 @@
 # | [-<strong>by-]{+by+} <a [-href=\"http://www.stallman.org/\";>Richard
 # | Stallman</a></strong>-] {+href=\"https://www.stallman.org/\";>Richard
 # | Stallman</a>+}
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 #, fuzzy
 #| msgid ""
 #| "<strong>by <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
@@ -237,7 +237,7 @@
 "<strong>oleh <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 "strong>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Catatan Kaki"
 
@@ -253,6 +253,25 @@
 "<strong>oleh <a href=\"http://www.stallman.org/\";>Richard Stallman</a></"
 "strong>"
 
+# | 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>.
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Esai ini telah dipublikasikan dalam buku <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>."
+
 # type: Content of: <table><tr><td><h3>
 #. type: Content of: <div><p>
 #, fuzzy
@@ -298,25 +317,6 @@
 msgid "Copyright notice above."
 msgstr ""
 
-# | 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>.
-#. type: Content of: <div><div><p>
-#, 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=\"https://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Free Software, Free Society: The Selected "
-"Essays of Richard M. Stallman</cite></a>."
-msgstr ""
-"Esai ini telah dipublikasikan dalam buku <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>."
-
 # type: Content of: <table><tr><td><h3>
 #. type: Content of: <blockquote><p>
 #, fuzzy

Index: server/gnun/compendia/compendium.it.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.it.po,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -b -r1.157 -r1.158
--- server/gnun/compendia/compendium.it.po      28 Aug 2021 14:06:19 -0000      
1.157
+++ server/gnun/compendia/compendium.it.po      30 Aug 2021 13:34:55 -0000      
1.158
@@ -207,12 +207,12 @@
 "</a>&nbsp;/ <a href=\"/education/education.html\">Istruzione</a>&nbsp;/ <a "
 "href=\"/education/edu-resources.html\">Risorse</a>&nbsp;/"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "di <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Note"
 
@@ -222,6 +222,25 @@
 msgstr ""
 "di <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></a>"
 
+# | 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>.
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Questo testo è stato pubblicato 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>."
+
 # | <em>Page text:</em>&nbsp; Copyright &copy; [-2019-] {+2019, 2020+} Free
 # | Software Foundation, Inc.
 #. type: Content of: <div><p>
@@ -304,25 +323,6 @@
 msgid "Copyright notice above."
 msgstr "La nota di copyright è qui sopra."
 
-# | 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>.
-#. type: Content of: <div><div><p>
-#, 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=\"https://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Free Software, Free Society: The Selected "
-"Essays of Richard M. Stallman</cite></a>."
-msgstr ""
-"Questo testo è stato pubblicato 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>."
-
 # type: Content of: <h3>
 #. type: Content of: <blockquote><p>
 msgid "Media Contact: Free Software Foundation"

Index: server/gnun/compendia/compendium.ja.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ja.po,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -b -r1.148 -r1.149
--- server/gnun/compendia/compendium.ja.po      28 Aug 2021 14:06:19 -0000      
1.148
+++ server/gnun/compendia/compendium.ja.po      30 Aug 2021 13:34:55 -0000      
1.149
@@ -191,11 +191,11 @@
 "</a>&nbsp;/ <a href=\"/education/education.html\">教育</a>&nbsp;/ <a 
href=\"/"
 "education/edu-resources.html\">教育向けリソース</a>&nbsp;/"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a 
href=\"https://www.stallman.org/\";>リチャード・ストールマン</a>著"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "脚注"
 
@@ -206,6 +206,21 @@
 "<a 
href=\"http://www.stallman.org/\";><strong>リチャード・ストールマン</"
 "strong></a>著"
 
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"この小論は<a 
href=\"http://shop.fsf.org/product/free-software-free-society/";
+"\"><cite>自由ソフトウェア、自由な社会: 
リチャード・M・ストールマン小論選集</"
+"cite></a>に収録され、出版されました。"
+
 #. type: Content of: <div><p>
 msgid ""
 "<em>Page text:</em>&nbsp; Copyright &copy; 2019, 2020 Free Software "
@@ -253,21 +268,6 @@
 msgid "Copyright notice above."
 msgstr "著作権表示。"
 
-#. type: Content of: <div><div><p>
-#, 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=\"https://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Free Software, Free Society: The Selected "
-"Essays of Richard M. Stallman</cite></a>."
-msgstr ""
-"この小論は<a 
href=\"http://shop.fsf.org/product/free-software-free-society/";
-"\"><cite>自由ソフトウェア、自由な社会: 
リチャード・M・ストールマン小論選集</"
-"cite></a>に収録され、出版されました。"
-
 #. type: Content of: <blockquote><p>
 msgid "Media Contact: Free Software Foundation"
 msgstr "報道連絡先: 
フリーソフトウェアファウンデーション"

Index: server/gnun/compendia/compendium.ko.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ko.po,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -b -r1.135 -r1.136
--- server/gnun/compendia/compendium.ko.po      28 Aug 2021 14:06:19 -0000      
1.135
+++ server/gnun/compendia/compendium.ko.po      30 Aug 2021 13:34:55 -0000      
1.136
@@ -188,11 +188,11 @@
 "\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "글: <a href=\"https://www.stallman.org/\";>리처드 스톨먼</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "각주"
 
@@ -202,6 +202,25 @@
 msgstr ""
 "글: <a href=\"http://www.stallman.org/\";><strong>리처드  
스톨먼</strong></a>"
 
+# | 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>.
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"이 글은 &lsquo;<a href=\"http://shop.fsf.org/product/free-software-free-";
+"society/\">자유 소프트웨어, 자유 사회: 리처드 M. 스톨먼 ì 
€ìž‘선집</a>&rsquo;"
+"에 포함되어 출판되었습니다."
+
 # | {+<em>Page text:</em>&nbsp;+} Copyright &copy; [-2011-] {+2019, 2020+}
 # | Free Software Foundation, Inc.
 #. type: Content of: <div><p>
@@ -247,25 +266,6 @@
 msgid "Copyright notice above."
 msgstr "저작권 고지는 아래에 있습니다."
 
-# | 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>.
-#. type: Content of: <div><div><p>
-#, 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=\"https://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Free Software, Free Society: The Selected "
-"Essays of Richard M. Stallman</cite></a>."
-msgstr ""
-"이 글은 &lsquo;<a href=\"http://shop.fsf.org/product/free-software-free-";
-"society/\">자유 소프트웨어, 자유 사회: 리처드 M. 스톨먼 ì 
€ìž‘선집</a>&rsquo;"
-"에 포함되어 출판되었습니다."
-
 #. type: Content of: <blockquote><p>
 #, fuzzy
 #| msgid "Thank GNUs - GNU Project - Free Software Foundation"

Index: server/gnun/compendia/compendium.lt.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.lt.po,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- server/gnun/compendia/compendium.lt.po      28 Aug 2021 14:06:19 -0000      
1.76
+++ server/gnun/compendia/compendium.lt.po      30 Aug 2021 13:34:55 -0000      
1.77
@@ -226,7 +226,7 @@
 # | by <a [-href=\"http://www.stallman.org/\";><strong>Richard
 # | Stallman</strong></a>-] {+href=\"https://www.stallman.org/\";>Richard
 # | Stallman</a>+}
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 #, fuzzy
 #| msgid ""
 #| "by <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</"
@@ -236,7 +236,7 @@
 "pagal <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</"
 "strong></a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Pastabos"
 
@@ -247,6 +247,25 @@
 "pagal <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</"
 "strong></a>"
 
+# | 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>.
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Ši esė publikuota <a href=\"http://shop.fsf.org/product/free-software-free-";
+"society/\"><cite>Laisva programinė įranga, laisva visuomenė: rinktinės "
+"Richard M. Stallman esės</cite></a>."
+
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
@@ -288,25 +307,6 @@
 msgid "Copyright notice above."
 msgstr ""
 
-# | 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>.
-#. type: Content of: <div><div><p>
-#, 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=\"https://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Free Software, Free Society: The Selected "
-"Essays of Richard M. Stallman</cite></a>."
-msgstr ""
-"Ši esė publikuota <a href=\"http://shop.fsf.org/product/free-software-free-";
-"society/\"><cite>Laisva programinė įranga, laisva visuomenė: rinktinės "
-"Richard M. Stallman esės</cite></a>."
-
 #. type: Content of: <blockquote><p>
 #, fuzzy
 #| msgid "Copyright &copy; 2014 Free Software Foundation, Inc."

Index: server/gnun/compendia/compendium.ml.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ml.po,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- server/gnun/compendia/compendium.ml.po      28 Aug 2021 14:06:19 -0000      
1.129
+++ server/gnun/compendia/compendium.ml.po      30 Aug 2021 13:34:55 -0000      
1.130
@@ -213,14 +213,14 @@
 
 # type: Content of: <p>
 # | by <a href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 #, fuzzy
 #| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "എഴുതിയതു് <a 
href=\"http://www.stallman.org/\";>റിച്ചാര്‍ഡ് 
സ്റ്റാള്‍മാന്‍</a>"
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "അടിക്കുറിപ്പു്"
 
@@ -232,6 +232,16 @@
 "<strong>എഴുതിയതു്: <a 
href=\"http://www.stallman.org\";>റിച്ചാര്‍ഡ് 
സ്റ്റാള്‍മാന്‍ </a></"
 "strong>"
 
+#. type: Content of: <div><div><p>
+msgid ""
+"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 ""
+"ഈ ലേഖനം <a 
href=\"https://shop.fsf.org/product/free-software-free-society/";
+"\"><cite>സ്വതന്ത്ര 
സോഫ്റ്റ്‌വെയര്‍, സ്വതന്ത്ര 
സമൂഹം: റിച്ചാര്‍ഡ് എം. 
സ്റ്റാള്‍മാന്റെ 
തിരഞ്ഞെടുത്ത "
+"ലേഖനങ്ങള്‍</cite></a> എന്ന 
പുസ്തകത്തില്‍ 
പ്രസിദ്ധീകരിച്ചതാണു്."
+
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
@@ -277,16 +287,6 @@
 msgid "Copyright notice above."
 msgstr ""
 
-#. type: Content of: <div><div><p>
-msgid ""
-"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 ""
-"ഈ ലേഖനം <a 
href=\"https://shop.fsf.org/product/free-software-free-society/";
-"\"><cite>സ്വതന്ത്ര 
സോഫ്റ്റ്‌വെയര്‍, സ്വതന്ത്ര 
സമൂഹം: റിച്ചാര്‍ഡ് എം. 
സ്റ്റാള്‍മാന്റെ 
തിരഞ്ഞെടുത്ത "
-"ലേഖനങ്ങള്‍</cite></a> എന്ന 
പുസ്തകത്തില്‍ 
പ്രസിദ്ധീകരിച്ചതാണു്."
-
 # type: Content of: <title>
 #. type: Content of: <blockquote><p>
 #, fuzzy

Index: server/gnun/compendia/compendium.ms.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ms.po,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/gnun/compendia/compendium.ms.po      28 Aug 2021 14:06:19 -0000      
1.35
+++ server/gnun/compendia/compendium.ms.po      30 Aug 2021 13:34:56 -0000      
1.36
@@ -191,11 +191,11 @@
 "\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr ""
 
@@ -204,6 +204,13 @@
 "by <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></a>"
 msgstr ""
 
+#. type: Content of: <div><div><p>
+msgid ""
+"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 ""
+
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "Copyright &copy; 2012, 2016 Free Software Foundation, Inc."
@@ -237,13 +244,6 @@
 msgid "Copyright notice above."
 msgstr ""
 
-#. type: Content of: <div><div><p>
-msgid ""
-"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 ""
-
 #. type: Content of: <blockquote><p>
 msgid "Media Contact: Free Software Foundation"
 msgstr ""

Index: server/gnun/compendia/compendium.nb.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.nb.po,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- server/gnun/compendia/compendium.nb.po      28 Aug 2021 14:06:19 -0000      
1.129
+++ server/gnun/compendia/compendium.nb.po      30 Aug 2021 13:34:56 -0000      
1.130
@@ -193,11 +193,11 @@
 "\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr ""
 
@@ -206,6 +206,13 @@
 "by <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></a>"
 msgstr ""
 
+#. type: Content of: <div><div><p>
+msgid ""
+"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 ""
+
 # type: Content of: <table><tr><td><h3>
 #. type: Content of: <div><p>
 #, fuzzy
@@ -251,13 +258,6 @@
 msgid "Copyright notice above."
 msgstr ""
 
-#. type: Content of: <div><div><p>
-msgid ""
-"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 ""
-
 # type: Content of: <table><tr><td><h3>
 #. type: Content of: <blockquote><p>
 #, fuzzy

Index: server/gnun/compendia/compendium.nl.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.nl.po,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- server/gnun/compendia/compendium.nl.po      28 Aug 2021 14:06:19 -0000      
1.124
+++ server/gnun/compendia/compendium.nl.po      30 Aug 2021 13:34:56 -0000      
1.125
@@ -205,12 +205,12 @@
 "</a>&nbsp;/ <a href=\"/education/education.html\">Onderwijs</a>&nbsp;/ <a "
 "href=\"/education/edu-resources.html\">Leer-hulpmiddelen</a>&nbsp;/"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "door <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
 # || No change detected.  The change might only be in amounts of spaces.
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Voetnoten"
 
@@ -226,6 +226,25 @@
 "<a href=\"http://www.fsf.org/associate/support_freedom/join_fsf";
 "\"><strong>Wordt vandaag lid van de FSF!</strong></a>"
 
+# | 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>.
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Dit artikel is opgenomen 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>."
+
 # type: Content of: <div><p>
 # | Copyright &copy; 201[-1-]{+9+} Free Software Foundation, Inc.
 #. type: Content of: <div><p>
@@ -278,25 +297,6 @@
 msgid "Copyright notice above."
 msgstr "Copyright-aanduiding: zie boven."
 
-# | 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>.
-#. type: Content of: <div><div><p>
-#, 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=\"https://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Free Software, Free Society: The Selected "
-"Essays of Richard M. Stallman</cite></a>."
-msgstr ""
-"Dit artikel is opgenomen 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>."
-
 #. type: Content of: <blockquote><p>
 #, fuzzy
 #| msgid "The Free Software Foundation"

Index: server/gnun/compendia/compendium.pl.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.pl.po,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -b -r1.146 -r1.147
--- server/gnun/compendia/compendium.pl.po      28 Aug 2021 14:06:19 -0000      
1.146
+++ server/gnun/compendia/compendium.pl.po      30 Aug 2021 13:34:56 -0000      
1.147
@@ -203,11 +203,11 @@
 "</a>&nbsp;/ <a href=\"/education/education.html\">Edukacja</a>&nbsp;/ <a "
 "href=\"/education/edu-resources.html\">Zasoby</a>&nbsp;/"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Przypisy"
 
@@ -217,6 +217,25 @@
 msgstr ""
 "<a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></a>"
 
+# | 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>.
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Ten esej jest opublikowany w&nbsp;<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>."
+
 #. type: Content of: <div><p>
 msgid ""
 "<em>Page text:</em>&nbsp; Copyright &copy; 2019, 2020 Free Software "
@@ -260,25 +279,6 @@
 msgid "Copyright notice above."
 msgstr "Notka o prawach autorskich powyżej."
 
-# | 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>.
-#. type: Content of: <div><div><p>
-#, 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=\"https://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Free Software, Free Society: The Selected "
-"Essays of Richard M. Stallman</cite></a>."
-msgstr ""
-"Ten esej jest opublikowany w&nbsp;<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>."
-
 #. type: Content of: <blockquote><p>
 msgid "Media Contact: Free Software Foundation"
 msgstr ""

Index: server/gnun/compendia/compendium.pot
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.pot,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -b -r1.133 -r1.134
--- server/gnun/compendia/compendium.pot        28 Aug 2021 14:06:19 -0000      
1.133
+++ server/gnun/compendia/compendium.pot        30 Aug 2021 13:34:56 -0000      
1.134
@@ -162,11 +162,11 @@
 "\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr ""
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr ""
 
@@ -175,6 +175,13 @@
 "by <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></a>"
 msgstr ""
 
+#. type: Content of: <div><div><p>
+msgid ""
+"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 ""
+
 #. type: Content of: <div><p>
 msgid ""
 "<em>Page text:</em>&nbsp; Copyright &copy; 2019, 2020 Free Software "
@@ -206,13 +213,6 @@
 msgid "Copyright notice above."
 msgstr ""
 
-#. type: Content of: <div><div><p>
-msgid ""
-"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 ""
-
 #. type: Content of: <blockquote><p>
 msgid "Media Contact: Free Software Foundation"
 msgstr ""

Index: server/gnun/compendia/compendium.pt-br.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.pt-br.po,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -b -r1.137 -r1.138
--- server/gnun/compendia/compendium.pt-br.po   28 Aug 2021 14:06:20 -0000      
1.137
+++ server/gnun/compendia/compendium.pt-br.po   30 Aug 2021 13:34:56 -0000      
1.138
@@ -195,11 +195,11 @@
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">Humor do GNU</a>&nbsp;/ <a "
 "href=\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "por <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Notas de rodapé"
 
@@ -211,6 +211,16 @@
 "por <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></"
 "a>"
 
+#. type: Content of: <div><div><p>
+msgid ""
+"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 ""
+"Este ensaio foi publicado em <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>."
+
 #. type: Content of: <div><p>
 msgid ""
 "<em>Page text:</em>&nbsp; Copyright &copy; 2019, 2020 Free Software "
@@ -255,16 +265,6 @@
 msgid "Copyright notice above."
 msgstr "Nota de direitos autorais acima."
 
-#. type: Content of: <div><div><p>
-msgid ""
-"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 ""
-"Este ensaio foi publicado em <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>."
-
 #. type: Content of: <blockquote><p>
 msgid "Media Contact: Free Software Foundation"
 msgstr "Contato com a mídia: Fundação do Software Livre"

Index: server/gnun/compendia/compendium.ro.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ro.po,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- server/gnun/compendia/compendium.ro.po      28 Aug 2021 14:06:20 -0000      
1.132
+++ server/gnun/compendia/compendium.ro.po      30 Aug 2021 13:34:56 -0000      
1.133
@@ -221,14 +221,14 @@
 # type: Content of: <p>
 # | by <a [-href=\"http://www.stallman.org/\";>Richard M.-]
 # | {+href=\"https://www.stallman.org/\";>Richard+} Stallman</a>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 #, fuzzy
 #| msgid "by <a href=\"http://www.stallman.org/\";>Richard M. Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "de <a href=\"http://www.stallman.org/\";>Richard M. Stallman</a>"
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Note de subsol"
 
@@ -239,6 +239,25 @@
 msgstr ""
 "de <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></a>"
 
+# | 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>.
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Acest eseu a fost publicat în <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>."
+
 # type: Content of: <div><p>
 # | {+<em>Page text:</em>&nbsp;+} Copyright &copy; [-2010-] {+2019, 2020+}
 # | Free Software Foundation, Inc.
@@ -286,25 +305,6 @@
 msgid "Copyright notice above."
 msgstr ""
 
-# | 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>.
-#. type: Content of: <div><div><p>
-#, 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=\"https://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Free Software, Free Society: The Selected "
-"Essays of Richard M. Stallman</cite></a>."
-msgstr ""
-"Acest eseu a fost publicat în <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>."
-
 #. type: Content of: <blockquote><p>
 #, fuzzy
 #| msgid "The Free Software Foundation Logo"

Index: server/gnun/compendia/compendium.ru.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ru.po,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -b -r1.133 -r1.134
--- server/gnun/compendia/compendium.ru.po      28 Aug 2021 14:06:20 -0000      
1.133
+++ server/gnun/compendia/compendium.ru.po      30 Aug 2021 13:34:56 -0000      
1.134
@@ -194,12 +194,12 @@
 "\"/fun/humor.html#Software\">Программы</a>&nbsp;/"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"https://www.stallman.org/\";>Ричард Столмен</a>"
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Примечания"
 
@@ -210,6 +210,16 @@
 msgstr ""
 "<a href=\"http://www.stallman.org/\";><strong>Ричард 
Столмен</strong></a>"
 
+#. type: Content of: <div><div><p>
+msgid ""
+"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 ""
+"Этот очерк публикуется в сборнике <a 
href=\"https://shop.fsf.org/product/";
+"free-software-free-society/\"><cite>Свободные программы, 
свободное общество: "
+"избранные очерки Ричарда М. 
Столмена</cite></a>."
+
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 msgid ""
@@ -262,16 +272,6 @@
 msgid "Copyright notice above."
 msgstr "Замечание об авторских правах дано 
выше."
 
-#. type: Content of: <div><div><p>
-msgid ""
-"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 ""
-"Этот очерк публикуется в сборнике <a 
href=\"https://shop.fsf.org/product/";
-"free-software-free-society/\"><cite>Свободные программы, 
свободное общество: "
-"избранные очерки Ричарда М. 
Столмена</cite></a>."
-
 #. type: Content of: <blockquote><p>
 #, fuzzy
 #| msgid "The Free Software Foundation"

Index: server/gnun/compendia/compendium.sk.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.sk.po,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- server/gnun/compendia/compendium.sk.po      28 Aug 2021 14:06:20 -0000      
1.127
+++ server/gnun/compendia/compendium.sk.po      30 Aug 2021 13:34:56 -0000      
1.128
@@ -205,7 +205,7 @@
 "\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 #, fuzzy
 #| msgid "<a href=\"http://www.fsf.org/fss\";>Free Software Supporter</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
@@ -213,7 +213,7 @@
 "Prihlásiť sa na odber <a href=\"http://www.fsf.org/fss\";><em>Free Software "
 "Supporter</em></a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr ""
 
@@ -222,6 +222,13 @@
 "by <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></a>"
 msgstr ""
 
+#. type: Content of: <div><div><p>
+msgid ""
+"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 ""
+
 # type: Content of: <title>
 #. type: Content of: <div><p>
 #, fuzzy
@@ -259,13 +266,6 @@
 msgid "Copyright notice above."
 msgstr ""
 
-#. type: Content of: <div><div><p>
-msgid ""
-"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 ""
-
 # type: Content of: <title>
 #. type: Content of: <blockquote><p>
 #, fuzzy

Index: server/gnun/compendia/compendium.sq.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.sq.po,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -b -r1.146 -r1.147
--- server/gnun/compendia/compendium.sq.po      28 Aug 2021 14:06:20 -0000      
1.146
+++ server/gnun/compendia/compendium.sq.po      30 Aug 2021 13:34:56 -0000      
1.147
@@ -211,12 +211,12 @@
 "</a>&nbsp;/ <a href=\"/education/education.html\">Edukim</a>&nbsp;/ <a href="
 "\"/education/education.html#indepth\">Në&nbsp;Thellësi</a>&nbsp;/"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "nga <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Poshtëshënime"
 
@@ -228,6 +228,16 @@
 "nga <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></"
 "a>"
 
+#. type: Content of: <div><div><p>
+msgid ""
+"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 ""
+"Kjo sprovë është botuar te <a href=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"> <cite>Software i Lirë, Shoqëri e Lirë: Sprova 
të "
+"Përzgjedhura të Richard M. Stallman-it</cite></a>."
+
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "Copyright &copy; 2019 Free Software Foundation, Inc."
@@ -269,16 +279,6 @@
 msgid "Copyright notice above."
 msgstr "Shënim të drejtash kopjimi më sipër."
 
-#. type: Content of: <div><div><p>
-msgid ""
-"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 ""
-"Kjo sprovë është botuar te <a href=\"https://shop.fsf.org/product/free-";
-"software-free-society/\"> <cite>Software i Lirë, Shoqëri e Lirë: Sprova 
të "
-"Përzgjedhura të Richard M. Stallman-it</cite></a>."
-
 #. type: Content of: <blockquote><p>
 msgid "Media Contact: Free Software Foundation"
 msgstr "Kontakte Për Median: Free Software Foundation"

Index: server/gnun/compendia/compendium.sr.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.sr.po,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- server/gnun/compendia/compendium.sr.po      28 Aug 2021 14:06:20 -0000      
1.128
+++ server/gnun/compendia/compendium.sr.po      30 Aug 2021 13:34:56 -0000      
1.129
@@ -224,14 +224,14 @@
 msgstr ""
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 #, fuzzy
 #| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "од <a href=\"http://www.stallman.org/\";>Ричарда 
Сталмана</a>"
 
 # type: Content of: <h3>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Фусноте"
 
@@ -242,6 +242,21 @@
 msgstr ""
 "од <a href=\"http://www.stallman.org/\";><strong>Ричарда 
Сталмана</strong></a>"
 
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Овај есеј је објављен у књизи <a 
href=\"http://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Слободни софтвер, 
слободно друштво: Одабрани "
+"есеји Ричарда М. Сталмана</cite></a>."
+
 # type: Content of: <div><p>
 #. type: Content of: <div><p>
 #, fuzzy
@@ -291,21 +306,6 @@
 msgid "Copyright notice above."
 msgstr ""
 
-#. type: Content of: <div><div><p>
-#, 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=\"https://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Free Software, Free Society: The Selected "
-"Essays of Richard M. Stallman</cite></a>."
-msgstr ""
-"Овај есеј је објављен у књизи <a 
href=\"http://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Слободни софтвер, 
слободно друштво: Одабрани "
-"есеји Ричарда М. Сталмана</cite></a>."
-
 # type: Content of: <title>
 #. type: Content of: <blockquote><p>
 #, fuzzy

Index: server/gnun/compendia/compendium.sv.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.sv.po,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -b -r1.130 -r1.131
--- server/gnun/compendia/compendium.sv.po      28 Aug 2021 14:06:20 -0000      
1.130
+++ server/gnun/compendia/compendium.sv.po      30 Aug 2021 13:34:56 -0000      
1.131
@@ -199,7 +199,7 @@
 "\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 #, fuzzy
 #| msgid ""
 #| "by <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</"
@@ -208,7 +208,7 @@
 msgstr ""
 "av <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr ""
 
@@ -218,6 +218,25 @@
 msgstr ""
 "av <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></a>"
 
+# | 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>.
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Denna essä är publicerad i <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>."
+
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid ""
@@ -267,25 +286,6 @@
 msgid "Copyright notice above."
 msgstr ""
 
-# | 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>.
-#. type: Content of: <div><div><p>
-#, 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=\"https://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Free Software, Free Society: The Selected "
-"Essays of Richard M. Stallman</cite></a>."
-msgstr ""
-"Denna essä är publicerad i <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>."
-
 #. type: Content of: <blockquote><p>
 #, fuzzy
 #| msgid ""

Index: server/gnun/compendia/compendium.ta.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.ta.po,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- server/gnun/compendia/compendium.ta.po      28 Aug 2021 14:06:20 -0000      
1.132
+++ server/gnun/compendia/compendium.ta.po      30 Aug 2021 13:34:56 -0000      
1.133
@@ -191,13 +191,13 @@
 msgstr ""
 
 # | by <a href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 #, fuzzy
 #| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "ஆசிரியர்: <a 
href=\"http://www.stallman.org/\";>ரிச்சர்ட் எம். 
ஸ்டால்மேன்</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "பின்குறிப்புகள்"
 
@@ -208,6 +208,25 @@
 "ஆசிரியர்: <a 
href=\"http://www.stallman.org/\";><strong>ரிச்சர்ட் 
எம். ஸ்டால்மேன்</"
 "strong></a>"
 
+# | 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>.
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"இக்கட்டுரை <a 
href=\"http://shop.fsf.org/product/free-software-free-society/";
+"\">கட்டற்ற மென்பொருள், 
கட்டற்ற சமூகம்: ரிச்சர்ட் 
ஸ்டால்மேனின் தேர்வு செய்யப் 
பட்ட கட்டுரைகள்</"
+"a> நூலில் இடம்பெற்றுள்ளது."
+
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "Copyright &copy; 2001, 2008, 2009 Free Software Foundation, Inc."
@@ -255,25 +274,6 @@
 msgid "Copyright notice above."
 msgstr ""
 
-# | 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>.
-#. type: Content of: <div><div><p>
-#, 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=\"https://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Free Software, Free Society: The Selected "
-"Essays of Richard M. Stallman</cite></a>."
-msgstr ""
-"இக்கட்டுரை <a 
href=\"http://shop.fsf.org/product/free-software-free-society/";
-"\">கட்டற்ற மென்பொருள், 
கட்டற்ற சமூகம்: ரிச்சர்ட் 
ஸ்டால்மேனின் தேர்வு செய்யப் 
பட்ட கட்டுரைகள்</"
-"a> நூலில் இடம்பெற்றுள்ளது."
-
 #. type: Content of: <blockquote><p>
 #, fuzzy
 #| msgid "Linux and GNU - GNU Project - Free Software Foundation"

Index: server/gnun/compendia/compendium.te.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.te.po,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- server/gnun/compendia/compendium.te.po      28 Aug 2021 14:06:20 -0000      
1.42
+++ server/gnun/compendia/compendium.te.po      30 Aug 2021 13:34:56 -0000      
1.43
@@ -174,13 +174,13 @@
 "\"/fun/humor.html#Software\">Software</a>&nbsp;/"
 msgstr ""
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 #, fuzzy
 #| msgid "<a href=\"//www.fsf.org/\">FSF</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"//www.fsf.org/\">FSF</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr ""
 
@@ -189,6 +189,13 @@
 "by <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</strong></a>"
 msgstr ""
 
+#. type: Content of: <div><div><p>
+msgid ""
+"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 ""
+
 #. type: Content of: <div><p>
 msgid ""
 "<em>Page text:</em>&nbsp; Copyright &copy; 2019, 2020 Free Software "
@@ -220,13 +227,6 @@
 msgid "Copyright notice above."
 msgstr ""
 
-#. type: Content of: <div><div><p>
-msgid ""
-"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 ""
-
 #. type: Content of: <blockquote><p>
 msgid "Media Contact: Free Software Foundation"
 msgstr ""

Index: server/gnun/compendia/compendium.tr.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.tr.po,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -b -r1.136 -r1.137
--- server/gnun/compendia/compendium.tr.po      28 Aug 2021 14:06:20 -0000      
1.136
+++ server/gnun/compendia/compendium.tr.po      30 Aug 2021 13:34:56 -0000      
1.137
@@ -193,11 +193,11 @@
 "</a>&nbsp;/ <a href=\"/fun/humor.html#content\">GNU&nbsp;mizahı</a>&nbsp;/ "
 "<a href=\"/music/music.html#content\">Yazılım</a>&nbsp;/"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "yazan <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Dipnotlar"
 
@@ -208,6 +208,16 @@
 "yazan <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</"
 "strong></a>"
 
+#. type: Content of: <div><div><p>
+msgid ""
+"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 ""
+"Bu yazı <a href=\"https://shop.fsf.org/product/free-software-free-society/";
+"\"><cite>Özgür Yazılım, Özgür Toplum: Richard M. Stallman'ın 
Seçilmiş "
+"Yazıları</cite></a> kitabında yayınlanmıştır."
+
 #. type: Content of: <div><p>
 msgid ""
 "<em>Page text:</em>&nbsp; Copyright &copy; 2019, 2020 Free Software "
@@ -251,16 +261,6 @@
 msgid "Copyright notice above."
 msgstr "Telif hakkı bildirimi yukarıdadır."
 
-#. type: Content of: <div><div><p>
-msgid ""
-"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 ""
-"Bu yazı <a href=\"https://shop.fsf.org/product/free-software-free-society/";
-"\"><cite>Özgür Yazılım, Özgür Toplum: Richard M. Stallman'ın 
Seçilmiş "
-"Yazıları</cite></a> kitabında yayınlanmıştır."
-
 #. type: Content of: <blockquote><p>
 msgid "Media Contact: Free Software Foundation"
 msgstr "Basın İletişimi: Özgür Yazılım Vakfı"

Index: server/gnun/compendia/compendium.uk.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.uk.po,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -b -r1.135 -r1.136
--- server/gnun/compendia/compendium.uk.po      28 Aug 2021 14:06:20 -0000      
1.135
+++ server/gnun/compendia/compendium.uk.po      30 Aug 2021 13:34:56 -0000      
1.136
@@ -207,11 +207,11 @@
 "</a>&nbsp;/ <a href=\"/education/education.html\">Освіта</a>&nbsp;/ <a 
href="
 "\"/education/edu-resources.html\">Ресурси</a>&nbsp;/"
 
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"https://www.stallman.org/\";>Річард Столмен</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "Виноски"
 
@@ -221,6 +221,21 @@
 msgstr ""
 "<a href=\"http://www.stallman.org/\";><strong>Річард 
Столмен</strong></a>"
 
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"Цей нарис був опублікований у книзі <a 
href=\"http://shop.fsf.org/product/";
+"free-software-free-society/\"><cite>Вільні програми&nbsp;&nbsp; 
вільне "
+"суспільство: Вибрані нариси Р
ічарда&nbsp;М.&nbsp;Столмена</cite></a>."
+
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
@@ -265,21 +280,6 @@
 msgid "Copyright notice above."
 msgstr "Зауваження про авторські права дано 
вище."
 
-#. type: Content of: <div><div><p>
-#, 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=\"https://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Free Software, Free Society: The Selected "
-"Essays of Richard M. Stallman</cite></a>."
-msgstr ""
-"Цей нарис був опублікований у книзі <a 
href=\"http://shop.fsf.org/product/";
-"free-software-free-society/\"><cite>Вільні програми&nbsp;&nbsp; 
вільне "
-"суспільство: Вибрані нариси Р
ічарда&nbsp;М.&nbsp;Столмена</cite></a>."
-
 #. type: Content of: <blockquote><p>
 #, fuzzy
 #| msgid "What is the Free Software Foundation?"

Index: server/gnun/compendia/compendium.zh-cn.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.zh-cn.po,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -b -r1.134 -r1.135
--- server/gnun/compendia/compendium.zh-cn.po   28 Aug 2021 14:06:20 -0000      
1.134
+++ server/gnun/compendia/compendium.zh-cn.po   30 Aug 2021 13:34:56 -0000      
1.135
@@ -202,12 +202,12 @@
 "education/edu-resources.html\">教育资源</a>&nbsp;/"
 
 # type: Content of: <p>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "<a href=\"https://www.stallman.org/\";>理查德·斯托曼</a> 著"
 
 # type: Content of: <h4>
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "脚注"
 
@@ -221,6 +221,15 @@
 msgstr ""
 "<a href=\"http://stallman.org/\";><strong>Richard Stallman</strong></a> 著"
 
+#. type: Content of: <div><div><p>
+msgid ""
+"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 ""
+"本文发表于<a 
href=\"https://shop.fsf.org/product/free-software-free-society/";
+"\"><cite>自由软件、自由社会:理查德.M.斯托曼 
选集</cite></a>。"
+
 #. type: Content of: <div><p>
 msgid ""
 "<em>Page text:</em>&nbsp; Copyright &copy; 2019, 2020 Free Software "
@@ -268,15 +277,6 @@
 msgid "Copyright notice above."
 msgstr "版权声明见上。"
 
-#. type: Content of: <div><div><p>
-msgid ""
-"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 ""
-"本文发表于<a 
href=\"https://shop.fsf.org/product/free-software-free-society/";
-"\"><cite>自由软件、自由社会:理查德.M.斯托曼 
选集</cite></a>。"
-
 # type: Content of: <title>
 #. type: Content of: <blockquote><p>
 #, fuzzy

Index: server/gnun/compendia/compendium.zh-tw.po
===================================================================
RCS file: /web/www/www/server/gnun/compendia/compendium.zh-tw.po,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -b -r1.128 -r1.129
--- server/gnun/compendia/compendium.zh-tw.po   28 Aug 2021 14:06:20 -0000      
1.128
+++ server/gnun/compendia/compendium.zh-tw.po   30 Aug 2021 13:34:56 -0000      
1.129
@@ -211,13 +211,13 @@
 "education.html#indepth\">深入討論</a> &rarr; 為什麼學æ 
¡åªæ‡‰æŽ¡ç”¨è‡ªç”±è»Ÿé«”"
 
 # | by <a href=\"http{+s+}://www.stallman.org/\">Richard Stallman</a>
-#. type: Content of: <address>
+#. type: Content of: <div><address>
 #, fuzzy
 #| msgid "by <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 msgid "by <a href=\"https://www.stallman.org/\";>Richard Stallman</a>"
 msgstr "作者為 <a href=\"http://www.stallman.org/\";>Richard Stallman</a>"
 
-#. type: Content of: <h3>
+#. type: Content of: <div><h3>
 msgid "Footnotes"
 msgstr "註釋"
 
@@ -228,6 +228,24 @@
 "作者為 <a href=\"http://www.stallman.org/\";><strong>Richard Stallman</"
 "strong></a>"
 
+# | 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>.
+#. type: Content of: <div><div><p>
+#, 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=\"https://shop.fsf.org/product/free-";
+"software-free-society/\"><cite>Free Software, Free Society: The Selected "
+"Essays of Richard M. Stallman</cite></a>."
+msgstr ""
+"本文發表於<a 
href=\"http://shop.fsf.org/product/free-software-free-society/";
+"\"><cite>自由軟體,自由社會:理查史托曼文選</cite></a>"
+
 #. type: Content of: <div><p>
 #, fuzzy
 #| msgid "Copyright &copy; 2014 Free Software Foundation, Inc."
@@ -268,24 +286,6 @@
 msgid "Copyright notice above."
 msgstr "上述著作權申明。"
 
-# | 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>.
-#. type: Content of: <div><div><p>
-#, 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=\"https://shop.fsf.org/product/free-";
-"software-free-society/\"><cite>Free Software, Free Society: The Selected "
-"Essays of Richard M. Stallman</cite></a>."
-msgstr ""
-"本文發表於<a 
href=\"http://shop.fsf.org/product/free-software-free-society/";
-"\"><cite>自由軟體,自由社會:理查史托曼文選</cite></a>"
-
 #. type: Content of: <blockquote><p>
 msgid "Media Contact: Free Software Foundation"
 msgstr "媒體聯絡:自由軟體基金會"



reply via email to

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